--- b/Mk/Uses/kde.mk	
+++ b/Mk/Uses/kde.mk	
@@ -58,7 +58,7 @@ KDE_PLASMA_VERSION?=		5.14.5
 KDE_PLASMA_BRANCH?=		stable
 
 # Current KDE frameworks.
-KDE_FRAMEWORKS_VERSION?=	5.53.0
+KDE_FRAMEWORKS_VERSION?=	5.54.0
 KDE_FRAMEWORKS_BRANCH?= 	stable
 
 # Current KDE applications.
--- b/archivers/kf5-karchive/distinfo	
+++ b/archivers/kf5-karchive/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691275
-SHA256 (KDE/frameworks/5.53.0/karchive-5.53.0.tar.xz) = 794350830a213336f5488e54916a81e71d1271e1cd65de92e3becffc550a7949
-SIZE (KDE/frameworks/5.53.0/karchive-5.53.0.tar.xz) = 439952
+TIMESTAMP = 1546843253
+SHA256 (KDE/frameworks/5.54.0/karchive-5.54.0.tar.xz) = 8f28ab8a8f7236ae5e9e6cf35263dbbb87a52ec938d35515f073bc33dbc33d90
+SIZE (KDE/frameworks/5.54.0/karchive-5.54.0.tar.xz) = 439964
--- b/devel/kf5-extra-cmake-modules/Makefile	
+++ b/devel/kf5-extra-cmake-modules/Makefile	
@@ -3,7 +3,6 @@ 
 
 PORTNAME=	extra-cmake-modules
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
--- b/devel/kf5-extra-cmake-modules/distinfo	
+++ b/devel/kf5-extra-cmake-modules/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691275
-SHA256 (KDE/frameworks/5.53.0/extra-cmake-modules-5.53.0.tar.xz) = 2da177fb849d8b4da2442d19a99c53040c1be5fee65b7e863d550290cfa7b41d
-SIZE (KDE/frameworks/5.53.0/extra-cmake-modules-5.53.0.tar.xz) = 324504
+TIMESTAMP = 1546843253
+SHA256 (KDE/frameworks/5.54.0/extra-cmake-modules-5.54.0.tar.xz) = 91b7a9359f1bfe6f667a5a9c23f6b2178555df26ca2e4dd1bb5c38dc36c77144
+SIZE (KDE/frameworks/5.54.0/extra-cmake-modules-5.54.0.tar.xz) = 324996
--- b/devel/kf5-extra-cmake-modules/pkg-plist	
+++ b/devel/kf5-extra-cmake-modules/pkg-plist	
@@ -16,6 +16,7 @@ share/ECM/find-modules/FindKF5.cmake
 share/ECM/find-modules/FindLibExiv2.cmake
 share/ECM/find-modules/FindLibGit2.cmake
 share/ECM/find-modules/FindOpenEXR.cmake
+share/ECM/find-modules/FindPhoneNumber.cmake
 share/ECM/find-modules/FindPng2Ico.cmake
 share/ECM/find-modules/FindPoppler.cmake
 share/ECM/find-modules/FindPulseAudio.cmake
--- b/devel/kf5-kapidox/distinfo	
+++ b/devel/kf5-kapidox/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691275
-SHA256 (KDE/frameworks/5.53.0/kapidox-5.53.0.tar.xz) = 8a25d63d23bd3424793edcc8189c4889e882c0393c394c338bd460a60bc5daea
-SIZE (KDE/frameworks/5.53.0/kapidox-5.53.0.tar.xz) = 396652
+TIMESTAMP = 1546843253
+SHA256 (KDE/frameworks/5.54.0/kapidox-5.54.0.tar.xz) = cc90ff22cb810e011e63fa99122fcaa8a60504e2b61f43939fba2af621f3927f
+SIZE (KDE/frameworks/5.54.0/kapidox-5.54.0.tar.xz) = 396720
--- b/devel/kf5-kauth/distinfo	
+++ b/devel/kf5-kauth/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691275
-SHA256 (KDE/frameworks/5.53.0/kauth-5.53.0.tar.xz) = 6b7c270812268e1a6925011932d8f8242635775f610377582e991b86ec578130
-SIZE (KDE/frameworks/5.53.0/kauth-5.53.0.tar.xz) = 84728
+TIMESTAMP = 1546843253
+SHA256 (KDE/frameworks/5.54.0/kauth-5.54.0.tar.xz) = 505c529d5456cf3eacdcdc8e80b5b258282d648f95b6ada7bbf99c17bf5a2ab2
+SIZE (KDE/frameworks/5.54.0/kauth-5.54.0.tar.xz) = 84688
--- b/devel/kf5-kbookmarks/distinfo	
+++ b/devel/kf5-kbookmarks/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691275
-SHA256 (KDE/frameworks/5.53.0/kbookmarks-5.53.0.tar.xz) = 29b782b48c80add374d0f209904a37950055f2803456f5d55f41d51c355f3fd7
-SIZE (KDE/frameworks/5.53.0/kbookmarks-5.53.0.tar.xz) = 118420
+TIMESTAMP = 1546843253
+SHA256 (KDE/frameworks/5.54.0/kbookmarks-5.54.0.tar.xz) = 7cb2211b90cb82a3a042785e86a468300e4f230ed5db5155bf4167e5bfc599f0
+SIZE (KDE/frameworks/5.54.0/kbookmarks-5.54.0.tar.xz) = 118432
--- b/devel/kf5-kcmutils/distinfo	
+++ b/devel/kf5-kcmutils/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691276
-SHA256 (KDE/frameworks/5.53.0/kcmutils-5.53.0.tar.xz) = 7b8edb638b71c4298946d8d9294e217c7c7165857081e504ff9f2bee2f284f77
-SIZE (KDE/frameworks/5.53.0/kcmutils-5.53.0.tar.xz) = 236756
+TIMESTAMP = 1546843253
+SHA256 (KDE/frameworks/5.54.0/kcmutils-5.54.0.tar.xz) = 90b3f65e9adcd004b4b3770fb2bd66e4979d243801990bd90ed4db236afab228
+SIZE (KDE/frameworks/5.54.0/kcmutils-5.54.0.tar.xz) = 236896
--- b/devel/kf5-kconfig/distinfo	
+++ b/devel/kf5-kconfig/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691276
-SHA256 (KDE/frameworks/5.53.0/kconfig-5.53.0.tar.xz) = 6735c1d7556fb9fd292bb67f4198eea4e15652e4f0b7efb2d30099b82ef3dd77
-SIZE (KDE/frameworks/5.53.0/kconfig-5.53.0.tar.xz) = 238024
+TIMESTAMP = 1546843253
+SHA256 (KDE/frameworks/5.54.0/kconfig-5.54.0.tar.xz) = e7b6023db1655b542ede2e0f598ca59551c04dff4ed6b178d31531022ae0e492
+SIZE (KDE/frameworks/5.54.0/kconfig-5.54.0.tar.xz) = 238464
--- b/devel/kf5-kcoreaddons/distinfo	
+++ b/devel/kf5-kcoreaddons/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691276
-SHA256 (KDE/frameworks/5.53.0/kcoreaddons-5.53.0.tar.xz) = fd64d27412c212840a3d8f7000d5f6c1616787e2e3419170872726574acb026b
-SIZE (KDE/frameworks/5.53.0/kcoreaddons-5.53.0.tar.xz) = 352448
+TIMESTAMP = 1546843254
+SHA256 (KDE/frameworks/5.54.0/kcoreaddons-5.54.0.tar.xz) = e9e8d033b912345d2b5eca7d1cddc4e3b3ce758539f6378fb248222d0d3a47d8
+SIZE (KDE/frameworks/5.54.0/kcoreaddons-5.54.0.tar.xz) = 359608
--- b/devel/kf5-kcrash/distinfo	
+++ b/devel/kf5-kcrash/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691277
-SHA256 (KDE/frameworks/5.53.0/kcrash-5.53.0.tar.xz) = 8b56adfb36b349619b8b2cd5af5f8633c18a48664a76f1b82fed243ac3b1ceda
-SIZE (KDE/frameworks/5.53.0/kcrash-5.53.0.tar.xz) = 21980
+TIMESTAMP = 1546843254
+SHA256 (KDE/frameworks/5.54.0/kcrash-5.54.0.tar.xz) = 47a1cc08465eb4e6ff4319a6ea61d75166c0dfaa4de9e4e7ecb7a5d8f8a79972
+SIZE (KDE/frameworks/5.54.0/kcrash-5.54.0.tar.xz) = 21980
--- b/devel/kf5-kdbusaddons/distinfo	
+++ b/devel/kf5-kdbusaddons/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691277
-SHA256 (KDE/frameworks/5.53.0/kdbusaddons-5.53.0.tar.xz) = d02b0cc7b881295333ba3cf265aae942bca510cf62e386cc949311396a20ee17
-SIZE (KDE/frameworks/5.53.0/kdbusaddons-5.53.0.tar.xz) = 36948
+TIMESTAMP = 1546843254
+SHA256 (KDE/frameworks/5.54.0/kdbusaddons-5.54.0.tar.xz) = 6e7d5adb73fe7c8780b9264c37198f23d1edf2361fdb47c0257ef0c1f0d574bb
+SIZE (KDE/frameworks/5.54.0/kdbusaddons-5.54.0.tar.xz) = 36948
--- b/devel/kf5-kdeclarative/distinfo	
+++ b/devel/kf5-kdeclarative/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691277
-SHA256 (KDE/frameworks/5.53.0/kdeclarative-5.53.0.tar.xz) = fc2c251212828f756e3fc9c27d62e873a55deccef0e625b3722fb131ceeffa30
-SIZE (KDE/frameworks/5.53.0/kdeclarative-5.53.0.tar.xz) = 172116
+TIMESTAMP = 1546843254
+SHA256 (KDE/frameworks/5.54.0/kdeclarative-5.54.0.tar.xz) = 40b2daa0d9843c6802ff250e7d0b9d3ffe740447b76c2b756243da4b3396d32a
+SIZE (KDE/frameworks/5.54.0/kdeclarative-5.54.0.tar.xz) = 172492
--- b/devel/kf5-kdoctools/distinfo	
+++ b/devel/kf5-kdoctools/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691277
-SHA256 (KDE/frameworks/5.53.0/kdoctools-5.53.0.tar.xz) = 32d86563fe18abde8af6b93eaa5f3ff689e5783982a16ffe19e765631897514e
-SIZE (KDE/frameworks/5.53.0/kdoctools-5.53.0.tar.xz) = 424780
+TIMESTAMP = 1546843254
+SHA256 (KDE/frameworks/5.54.0/kdoctools-5.54.0.tar.xz) = a6c556eed5d7362ed20d75458386dec4de04feae3c583ed1133a71bf296e7575
+SIZE (KDE/frameworks/5.54.0/kdoctools-5.54.0.tar.xz) = 424772
--- b/devel/kf5-kfilemetadata/distinfo	
+++ b/devel/kf5-kfilemetadata/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691278
-SHA256 (KDE/frameworks/5.53.0/kfilemetadata-5.53.0.tar.xz) = 1a08707ce6f6203f1f3770d628fc027d1cae7f5daa9f6acf633a1a121efc8fa3
-SIZE (KDE/frameworks/5.53.0/kfilemetadata-5.53.0.tar.xz) = 300164
+TIMESTAMP = 1546843255
+SHA256 (KDE/frameworks/5.54.0/kfilemetadata-5.54.0.tar.xz) = 4b6de53b791ad8cf19d5aa331555e3863f22e54adf6149668125635b820f86c2
+SIZE (KDE/frameworks/5.54.0/kfilemetadata-5.54.0.tar.xz) = 302204
--- b/devel/kf5-ki18n/distinfo	
+++ b/devel/kf5-ki18n/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691278
-SHA256 (KDE/frameworks/5.53.0/ki18n-5.53.0.tar.xz) = 3d108cf51dacf194afdd617d1d4bf56d97cf38b94d876479ea502c8c773e4c14
-SIZE (KDE/frameworks/5.53.0/ki18n-5.53.0.tar.xz) = 586924
+TIMESTAMP = 1546843255
+SHA256 (KDE/frameworks/5.54.0/ki18n-5.54.0.tar.xz) = e30ef58bc7cd0b0ca585f06f9443b1911ad223b9bbbf65116a0112e245f62b37
+SIZE (KDE/frameworks/5.54.0/ki18n-5.54.0.tar.xz) = 586796
--- b/devel/kf5-kidletime/distinfo	
+++ b/devel/kf5-kidletime/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691278
-SHA256 (KDE/frameworks/5.53.0/kidletime-5.53.0.tar.xz) = 310ff23423ca4c4f289b3228f6c2250f7fb1c6dfc6c4c7a5fab51057d38b4b12
-SIZE (KDE/frameworks/5.53.0/kidletime-5.53.0.tar.xz) = 26588
+TIMESTAMP = 1546843255
+SHA256 (KDE/frameworks/5.54.0/kidletime-5.54.0.tar.xz) = 55ee8191a7d5dade374c0387bd84f2c6a14e99aae6763aa734fbfdd86e041ff4
+SIZE (KDE/frameworks/5.54.0/kidletime-5.54.0.tar.xz) = 26608
--- b/devel/kf5-kio/distinfo	
+++ b/devel/kf5-kio/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691279
-SHA256 (KDE/frameworks/5.53.0/kio-5.53.0.tar.xz) = 7320df009b19ab9ad3acfeb0d8cf9e0824d5779930fb85f59208deb0cb4124c3
-SIZE (KDE/frameworks/5.53.0/kio-5.53.0.tar.xz) = 3143732
+TIMESTAMP = 1547270349
+SHA256 (KDE/frameworks/5.54.0/kio-5.54.0.tar.xz) = 3cf05a021e6431c2d2b16525dd130a02269cb6fc2cf99ce3b4725d33c0bf5c7d
+SIZE (KDE/frameworks/5.54.0/kio-5.54.0.tar.xz) = 3150624
--- b/devel/kf5-kitemmodels/distinfo	
+++ b/devel/kf5-kitemmodels/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691279
-SHA256 (KDE/frameworks/5.53.0/kitemmodels-5.53.0.tar.xz) = 747d2c4f9e78db802971172b31bb342fb4376b68092bad65f2ac99fadc297cbe
-SIZE (KDE/frameworks/5.53.0/kitemmodels-5.53.0.tar.xz) = 389920
+TIMESTAMP = 1546843255
+SHA256 (KDE/frameworks/5.54.0/kitemmodels-5.54.0.tar.xz) = c09c465e8a2494f4f772ea81dd6398d94074ab3e753101febb93aca5cbd97ce8
+SIZE (KDE/frameworks/5.54.0/kitemmodels-5.54.0.tar.xz) = 389708
--- b/devel/kf5-knewstuff/distinfo	
+++ b/devel/kf5-knewstuff/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691279
-SHA256 (KDE/frameworks/5.53.0/knewstuff-5.53.0.tar.xz) = 039b38e8599cb1320c1c8cc8452c9ac9b24e864bca49507295184967dcd7be34
-SIZE (KDE/frameworks/5.53.0/knewstuff-5.53.0.tar.xz) = 1008760
+TIMESTAMP = 1546843255
+SHA256 (KDE/frameworks/5.54.0/knewstuff-5.54.0.tar.xz) = a3d9e7bde65591895711a1c5e74a980d20ffa7346e421a969618ab2d9b5a71d0
+SIZE (KDE/frameworks/5.54.0/knewstuff-5.54.0.tar.xz) = 1008916
--- b/devel/kf5-knotifications/distinfo	
+++ b/devel/kf5-knotifications/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691279
-SHA256 (KDE/frameworks/5.53.0/knotifications-5.53.0.tar.xz) = df9ef2b24f768bfced82a94af0756edc215b93dbe580411f4ab99ac910797239
-SIZE (KDE/frameworks/5.53.0/knotifications-5.53.0.tar.xz) = 102992
+TIMESTAMP = 1546843256
+SHA256 (KDE/frameworks/5.54.0/knotifications-5.54.0.tar.xz) = d6c7ea727ce6464c7aa65eadad1b81cc03906c978373a0991b9003a7f8a6efa9
+SIZE (KDE/frameworks/5.54.0/knotifications-5.54.0.tar.xz) = 105860
--- b/devel/kf5-knotifyconfig/distinfo	
+++ b/devel/kf5-knotifyconfig/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691280
-SHA256 (KDE/frameworks/5.53.0/knotifyconfig-5.53.0.tar.xz) = 262119a7c39c2e9102062512c495f386a42d8191741a376d23ce4d87a8c070b8
-SIZE (KDE/frameworks/5.53.0/knotifyconfig-5.53.0.tar.xz) = 83544
+TIMESTAMP = 1546843256
+SHA256 (KDE/frameworks/5.54.0/knotifyconfig-5.54.0.tar.xz) = 2e8ea75a4dad70c210adaeb0617e953da956ef75bccf6889940f0fe241c47dc5
+SIZE (KDE/frameworks/5.54.0/knotifyconfig-5.54.0.tar.xz) = 83564
--- b/devel/kf5-kpackage/distinfo	
+++ b/devel/kf5-kpackage/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691280
-SHA256 (KDE/frameworks/5.53.0/kpackage-5.53.0.tar.xz) = 2a272077b595639d4880fcbcab4b7102aa08db1a5083bb219f746be24f5c94be
-SIZE (KDE/frameworks/5.53.0/kpackage-5.53.0.tar.xz) = 132624
+TIMESTAMP = 1546843256
+SHA256 (KDE/frameworks/5.54.0/kpackage-5.54.0.tar.xz) = ebef00a26a0c95a912797c927137e2a23570be525abf5650db93d023473e36e8
+SIZE (KDE/frameworks/5.54.0/kpackage-5.54.0.tar.xz) = 132812
--- b/devel/kf5-kparts/distinfo	
+++ b/devel/kf5-kparts/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691280
-SHA256 (KDE/frameworks/5.53.0/kparts-5.53.0.tar.xz) = 355aa9dc232c80433a2141020b487160fe065458a3fc8abe9cc436038e5bdf31
-SIZE (KDE/frameworks/5.53.0/kparts-5.53.0.tar.xz) = 175788
+TIMESTAMP = 1546843256
+SHA256 (KDE/frameworks/5.54.0/kparts-5.54.0.tar.xz) = 26aafe766def66b152a82da496a0c75469a94edb6960174f265c2c6890c84d78
+SIZE (KDE/frameworks/5.54.0/kparts-5.54.0.tar.xz) = 175800
--- b/devel/kf5-kpeople/distinfo	
+++ b/devel/kf5-kpeople/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691281
-SHA256 (KDE/frameworks/5.53.0/kpeople-5.53.0.tar.xz) = af5d8a0ad7d57a3a8f65f1aacb8248afbaec16e3b4f51f1342f4ab43729156af
-SIZE (KDE/frameworks/5.53.0/kpeople-5.53.0.tar.xz) = 60404
+TIMESTAMP = 1546843256
+SHA256 (KDE/frameworks/5.54.0/kpeople-5.54.0.tar.xz) = 1d86fcfaa1dc0f232fd851e3005753be45f82c95db55b4d9676f277e24e3886a
+SIZE (KDE/frameworks/5.54.0/kpeople-5.54.0.tar.xz) = 60412
--- b/devel/kf5-kpty/distinfo	
+++ b/devel/kf5-kpty/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691281
-SHA256 (KDE/frameworks/5.53.0/kpty-5.53.0.tar.xz) = 3ffd3a7a459aa069c980b8ad050cf3e1818e1606509742e02701c8d2f62d1e07
-SIZE (KDE/frameworks/5.53.0/kpty-5.53.0.tar.xz) = 58048
+TIMESTAMP = 1546843257
+SHA256 (KDE/frameworks/5.54.0/kpty-5.54.0.tar.xz) = a3225753821185a6c131a9149eca2dd76b30c854235729a60f6194d045305213
+SIZE (KDE/frameworks/5.54.0/kpty-5.54.0.tar.xz) = 58052
--- b/devel/kf5-kservice/distinfo	
+++ b/devel/kf5-kservice/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691281
-SHA256 (KDE/frameworks/5.53.0/kservice-5.53.0.tar.xz) = 62da0b610f51f2b3e10d55b9af75dbdc70e680d8b89edbff6b11d26afd2f6319
-SIZE (KDE/frameworks/5.53.0/kservice-5.53.0.tar.xz) = 250628
+TIMESTAMP = 1546843257
+SHA256 (KDE/frameworks/5.54.0/kservice-5.54.0.tar.xz) = 1d0f4a74e72e1158014263b6166b764e186c0d5af5d1a8e4b7c541e93cce1583
+SIZE (KDE/frameworks/5.54.0/kservice-5.54.0.tar.xz) = 250588
--- b/devel/kf5-ktexteditor/distinfo	
+++ b/devel/kf5-ktexteditor/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691281
-SHA256 (KDE/frameworks/5.53.0/ktexteditor-5.53.0.tar.xz) = ef2c831120e145e21e1f76b32a2748fa60ee42f4c93603ed5426f167662396c1
-SIZE (KDE/frameworks/5.53.0/ktexteditor-5.53.0.tar.xz) = 2261344
+TIMESTAMP = 1546843257
+SHA256 (KDE/frameworks/5.54.0/ktexteditor-5.54.0.tar.xz) = feefc112f4dd0e7f73d2ddc5bcc8e83b11ab0a911d079950afb85281f6e6de8b
+SIZE (KDE/frameworks/5.54.0/ktexteditor-5.54.0.tar.xz) = 2264380
--- b/devel/kf5-kunitconversion/distinfo	
+++ b/devel/kf5-kunitconversion/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691282
-SHA256 (KDE/frameworks/5.53.0/kunitconversion-5.53.0.tar.xz) = dbf01ad2fa50514ce41fc88929bc5b81a11e1a2401b9744f167b2e85996b26fb
-SIZE (KDE/frameworks/5.53.0/kunitconversion-5.53.0.tar.xz) = 772772
+TIMESTAMP = 1546843257
+SHA256 (KDE/frameworks/5.54.0/kunitconversion-5.54.0.tar.xz) = 10d165fff9b8b655793326dbb3eccbd779349b39ed66ac44aa8e462a6df3b953
+SIZE (KDE/frameworks/5.54.0/kunitconversion-5.54.0.tar.xz) = 773152
--- b/devel/kf5-solid/distinfo	
+++ b/devel/kf5-solid/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691282
-SHA256 (KDE/frameworks/5.53.0/solid-5.53.0.tar.xz) = 964e99e977c0acc6dba42798b57637bd1670b8f5572c9934c7749b50376238f5
-SIZE (KDE/frameworks/5.53.0/solid-5.53.0.tar.xz) = 257904
+TIMESTAMP = 1546843257
+SHA256 (KDE/frameworks/5.54.0/solid-5.54.0.tar.xz) = 29d70bbed462baac31cce45cf3082600a12ccf53ad1da0a49a3168d72c4cb042
+SIZE (KDE/frameworks/5.54.0/solid-5.54.0.tar.xz) = 258112
--- b/devel/kf5-threadweaver/distinfo	
+++ b/devel/kf5-threadweaver/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691282
-SHA256 (KDE/frameworks/5.53.0/threadweaver-5.53.0.tar.xz) = d768b6f14c58eff356640e0e54cf5449b31718b88326e6808656bc62955d9772
-SIZE (KDE/frameworks/5.53.0/threadweaver-5.53.0.tar.xz) = 1409548
+TIMESTAMP = 1546843257
+SHA256 (KDE/frameworks/5.54.0/threadweaver-5.54.0.tar.xz) = b72f53f118874f27078cd170a0243699f4ac2c6496c5e66dd7c0640eea153304
+SIZE (KDE/frameworks/5.54.0/threadweaver-5.54.0.tar.xz) = 1409544
--- b/dns/kf5-kdnssd/distinfo	
+++ b/dns/kf5-kdnssd/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691283
-SHA256 (KDE/frameworks/5.53.0/kdnssd-5.53.0.tar.xz) = 0b66372890af57e6a111cfd59ff9a76ff7ba80f00c0b7f10745bf23eabbaf041
-SIZE (KDE/frameworks/5.53.0/kdnssd-5.53.0.tar.xz) = 58032
+TIMESTAMP = 1546843258
+SHA256 (KDE/frameworks/5.54.0/kdnssd-5.54.0.tar.xz) = 677ed3d572706cc896c1e05bb2f1fb1a6c50ffaa13d1c62de13e35eca1e85803
+SIZE (KDE/frameworks/5.54.0/kdnssd-5.54.0.tar.xz) = 58032
--- b/graphics/kf5-kimageformats/distinfo	
+++ b/graphics/kf5-kimageformats/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691283
-SHA256 (KDE/frameworks/5.53.0/kimageformats-5.53.0.tar.xz) = d2a9af7ba7b3af7fe824eeb98ffd6547cc84d677bd2798f6fcbda2d28bd2a92c
-SIZE (KDE/frameworks/5.53.0/kimageformats-5.53.0.tar.xz) = 203472
+TIMESTAMP = 1546843258
+SHA256 (KDE/frameworks/5.54.0/kimageformats-5.54.0.tar.xz) = 25c4476be9eeea57254b4fb30ea25e169d887d060b1ff176e7ccb687d5bfdf75
+SIZE (KDE/frameworks/5.54.0/kimageformats-5.54.0.tar.xz) = 203148
--- b/graphics/kf5-kplotting/distinfo	
+++ b/graphics/kf5-kplotting/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691283
-SHA256 (KDE/frameworks/5.53.0/kplotting-5.53.0.tar.xz) = fdca61dd7031eaebc08a62bba97aeb31c3a9a489873006a1cd2debbfbcffd632
-SIZE (KDE/frameworks/5.53.0/kplotting-5.53.0.tar.xz) = 29740
+TIMESTAMP = 1546843258
+SHA256 (KDE/frameworks/5.54.0/kplotting-5.54.0.tar.xz) = 89ffaf63eb4f7a75b02022986257d57717c6020a75f2c53b92ed392f015aaa0a
+SIZE (KDE/frameworks/5.54.0/kplotting-5.54.0.tar.xz) = 29752
--- b/graphics/kf5-prison/distinfo	
+++ b/graphics/kf5-prison/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691283
-SHA256 (KDE/frameworks/5.53.0/prison-5.53.0.tar.xz) = 61b5f10b48d847ce60769d10525a8f4c3c7120d71dd8e2e6285d303ea519b579
-SIZE (KDE/frameworks/5.53.0/prison-5.53.0.tar.xz) = 41744
+TIMESTAMP = 1546843258
+SHA256 (KDE/frameworks/5.54.0/prison-5.54.0.tar.xz) = 6b8e6db9ce142d47014403c6e5bcc79c8a7a77b3a490102d508a4f4866f5effc
+SIZE (KDE/frameworks/5.54.0/prison-5.54.0.tar.xz) = 41736
--- b/java/openjdk8/Makefile	
+++ b/java/openjdk8/Makefile	
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
-PORTREVISION=	3
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
 		https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
@@ -34,8 +34,7 @@ PATCHFILES=	patch-8u05-b13.xz \
 		patch-8u152-b16.xz \
 		patch-8u162-b12.xz \
 		patch-8u172-b11.xz \
-		patch-8u181-b13.xz \
-		patch-8u192-b26.xz
+		patch-8u181-b13.xz
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT?=	Java Development Kit ${JDK_MAJOR_VERSION}
@@ -46,8 +45,7 @@ BUILD_DEPENDS=	zip:archivers/zip \
 		autoconf>0:devel/autoconf \
 		${LOCALBASE}/include/cups/cups.h:print/cups \
 		bash:shells/bash
-LIB_DEPENDS=	libfreetype.so:print/freetype2 \
-		libinotify.so:devel/libinotify
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		dejavu>0:x11-fonts/dejavu
 
@@ -208,8 +206,8 @@ INSTALLDIR=	${PREFIX}/${PKGBASE}
 NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	8
-JDK_UPDATE_VERSION=	192
-JDK_BUILD_NUMBER=	26
+JDK_UPDATE_VERSION=	181
+JDK_BUILD_NUMBER=	13
 DIST_BUILD_NUMBER=	132
 JTREG_VERSION=		4.1
 JTREG_BUILD_NUMBER=	b08
@@ -363,7 +361,6 @@ CONFIGURE_ENV+=	LIBCXX="-lc++"
 
 # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
 .if ${COMPILER_TYPE} == gcc
-CONFIGURE_ARGS+=	--with-toolchain-type=gcc
 .if ${ARCH} == "powerpc64"
 MAKE_ARGS+=	USE_PRECOMPILED_HEADER=1
 .else
@@ -407,7 +404,6 @@ post-patch:
 	    ${WRKSRC}/configure \
 	    ${WRKSRC}/common/autoconf/toolchain.m4 \
 	    ${WRKSRC}/jdk/make/lib/Awt2dLibraries.gmk \
-	    ${WRKSRC}/jdk/make/lib/NioLibraries.gmk \
 	    ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \
 	    ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java \
 	    ${WRKSRC}/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java
--- b/java/openjdk8/distinfo	
+++ b/java/openjdk8/distinfo	
@@ -49,5 +49,3 @@ SHA256 (patch-8u172-b11.xz) = e338a1dc63cc08f9227d685e350e60609e43612f18773213b8
 SIZE (patch-8u172-b11.xz) = 146716
 SHA256 (patch-8u181-b13.xz) = 4cd0f5a04b72ad6c4ef73807d6a42e141394f5c38cee8ce11c0159a080073839
 SIZE (patch-8u181-b13.xz) = 69096
-SHA256 (patch-8u192-b26.xz) = 5bfa782ec2af8ddc6aed3e8de81cc37c7f375ebad650341d1ce74956c82a411e
-SIZE (patch-8u192-b26.xz) = 284164
--- b/java/openjdk8/files/patch-bsd	
+++ b/java/openjdk8/files/patch-bsd	
@@ -1,5 +1,5 @@ 
---- ./common/autoconf/build-performance.m4	Sat Oct 06 10:24:47 2018 +0100
-+++ ./common/autoconf/build-performance.m4	Sat Dec 01 12:25:45 2018 -0800
+--- ./common/autoconf/build-performance.m4	Sat Jun 23 21:01:22 2018 -0700
++++ ./common/autoconf/build-performance.m4	Mon Sep 03 11:10:31 2018 -0700
 @@ -41,6 +41,10 @@
      # Looks like a MacOSX system
      NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk  '{print [$]5}'`
@@ -27,7 +27,7 @@ 
    elif test "x$OPENJDK_BUILD_OS" = xwindows; then
      # Windows, but without cygwin
      MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
-@@ -209,8 +222,8 @@
+@@ -199,8 +212,8 @@
      # Only use ccache if it is 3.1.4 or later, which supports
      # precompiled headers.
      AC_MSG_CHECKING([if ccache supports precompiled headers])
@@ -37,66 +37,10 @@ 
 +    if test "x$HAS_GOOD_CCACHE" = xyes; then
        AC_MSG_RESULT([no, disabling ccache])
        CCACHE=
-       CCACHE_STATUS="disabled"
---- ./common/autoconf/flags.m4	Sat Oct 06 10:24:47 2018 +0100
-+++ ./common/autoconf/flags.m4	Sat Dec 01 12:25:45 2018 -0800
-@@ -154,7 +154,7 @@
-   # How to compile shared libraries.
-   #
- 
--  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-     PICFLAG="-fPIC"
-     C_FLAG_REORDER=''
-     CXX_FLAG_REORDER=''
-@@ -266,7 +266,7 @@
-   # fi
- 
-   # Generate make dependency files
--  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-     C_FLAG_DEPS="-MMD -MF"
-   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
-     C_FLAG_DEPS="-xMMD -xMF"
-@@ -278,7 +278,7 @@
-   AC_SUBST(CXX_FLAG_DEPS)
- 
-   # Debug symbols
--  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-     if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
-       CFLAGS_DEBUG_SYMBOLS="-g1"
-       CXXFLAGS_DEBUG_SYMBOLS="-g1"
-@@ -327,7 +327,7 @@
-   else
-     # The remaining toolchains share opt flags between CC and CXX;
-     # setup for C and duplicate afterwards.
--    if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-       if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-         # On MacOSX we optimize for size, something
-         # we should do for all platforms?
-@@ -431,7 +431,7 @@
- 
-   # Setup compiler/platform specific flags to CFLAGS_JDK,
-   # CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?)
--  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-     # these options are used for both C and C++ compiles
-     CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \
-         -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
-@@ -633,7 +633,7 @@
-     fi
-     LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
-   else
--    if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-       # If this is a --hash-style=gnu system, use --hash-style=both, why?
-       # We have previously set HAS_GNU_HASH if this is the case
-       if test -n "$HAS_GNU_HASH"; then
---- ./common/autoconf/generated-configure.sh	Sat Oct 06 10:24:47 2018 +0100
-+++ ./common/autoconf/generated-configure.sh	Sat Dec 01 12:25:45 2018 -0800
-@@ -654,6 +654,8 @@
+     else
+--- ./common/autoconf/generated-configure.sh	Sat Jun 23 21:01:22 2018 -0700
++++ ./common/autoconf/generated-configure.sh	Mon Sep 03 11:10:31 2018 -0700
+@@ -646,6 +646,8 @@
  LIBM
  LIBZIP_CAN_USE_MMAP
  USE_EXTERNAL_LIBZ
@@ -105,7 +49,7 @@ 
  USE_EXTERNAL_LIBGIF
  USE_EXTERNAL_LIBJPEG
  ALSA_LIBS
-@@ -837,6 +839,7 @@
+@@ -824,6 +826,7 @@
  JDK_MAJOR_VERSION
  USER_RELEASE_SUFFIX
  COMPRESS_JARS
@@ -113,15 +57,15 @@ 
  UNLIMITED_CRYPTO
  CACERTS_FILE
  TEST_IN_BUILD
-@@ -914,6 +917,7 @@
+@@ -900,6 +903,7 @@
+ OPENJDK_TARGET_CPU_ARCH
  OPENJDK_TARGET_CPU
- OPENJDK_TARGET_OS_ENV
  OPENJDK_TARGET_OS_API
 +OPENJDK_TARGET_OS_VENDOR
  OPENJDK_TARGET_OS
  OPENJDK_BUILD_CPU_ENDIAN
  OPENJDK_BUILD_CPU_BITS
-@@ -1050,6 +1054,7 @@
+@@ -1032,6 +1036,7 @@
  enable_hotspot_test_in_build
  with_cacerts_file
  enable_unlimited_crypto
@@ -129,15 +73,15 @@ 
  with_milestone
  with_update_version
  with_user_release_suffix
-@@ -1070,6 +1075,7 @@
- with_import_hotspot
- with_toolchain_type
- with_toolchain_version
-+with_package_path
- with_jtreg
+@@ -1058,6 +1063,7 @@
  with_extra_cflags
  with_extra_cxxflags
-@@ -1827,6 +1833,7 @@
+ with_extra_ldflags
++with_package_path
+ enable_debug_symbols
+ enable_zip_debug_info
+ enable_macosx_runtime_support
+@@ -1734,6 +1740,7 @@
                            run the Queens test after Hotspot build [disabled]
    --enable-unlimited-crypto
                            Enable unlimited crypto policy [disabled]
@@ -145,33 +89,25 @@ 
    --disable-debug-symbols disable generation of debug symbols [enabled]
    --disable-zip-debug-info
                            disable zipping of debug-info files [enabled]
-@@ -1919,6 +1926,8 @@
-                           the version of the toolchain to look for, use
-                           '--help' to show possible values [platform
-                           dependent]
-+  --with-package-path     package path to be used for location of third party
-+                          packages
-   --with-jtreg            Regression Test Harness [probed]
+@@ -1830,6 +1837,8 @@
    --with-extra-cflags     extra flags to be used when compiling jdk c-files
    --with-extra-cxxflags   extra flags to be used when compiling jdk c++-files
-@@ -4121,6 +4130,7 @@
- VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft"
- 
- # These toolchains are valid on different platforms
-+VALID_TOOLCHAINS_bsd="clang gcc"
- VALID_TOOLCHAINS_linux="gcc clang"
- VALID_TOOLCHAINS_solaris="solstudio"
- VALID_TOOLCHAINS_macosx="gcc clang"
-@@ -4336,7 +4346,7 @@
- #CUSTOM_AUTOCONF_INCLUDE
- 
- # Do not change or remove the following line, it is needed for consistency checks:
--DATE_WHEN_GENERATED=1536764960
-+DATE_WHEN_GENERATED=1543299193
- 
- ###############################################################################
+   --with-extra-ldflags    extra flags to be used when linking jdk
++  --with-package-path     package path to be used for location of third party
++                          packages
+   --with-x                use the X Window System
+   --with-cups             specify prefix directory for the cups package
+                           (expecting the headers under PATH/include)
+@@ -3744,7 +3753,7 @@
+ 
+ 
  #
-@@ -13570,11 +13580,27 @@
+-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -6840,11 +6849,27 @@
        as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5
        ;;
    esac
@@ -200,7 +136,7 @@ 
        VAR_CPU=x86_64
        VAR_CPU_ARCH=x86
        VAR_CPU_BITS=64
-@@ -13708,11 +13734,27 @@
+@@ -6977,11 +7002,27 @@
        as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5
        ;;
    esac
@@ -229,7 +165,7 @@ 
        VAR_CPU=x86_64
        VAR_CPU_ARCH=x86
        VAR_CPU_BITS=64
-@@ -13785,6 +13827,7 @@
+@@ -7054,6 +7095,7 @@
  
    # ... and setup our own variables. (Do this explicitely to facilitate searching)
    OPENJDK_TARGET_OS="$VAR_OS"
@@ -237,7 +173,7 @@ 
    OPENJDK_TARGET_OS_API="$VAR_OS_API"
    OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
    OPENJDK_TARGET_CPU="$VAR_CPU"
-@@ -13799,6 +13842,7 @@
+@@ -7067,6 +7109,7 @@
  
  
  
@@ -245,7 +181,7 @@ 
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5
  $as_echo_n "checking openjdk-target os-cpu... " >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5
-@@ -13927,8 +13971,8 @@
+@@ -7195,8 +7238,8 @@
  
    # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
    OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
@@ -256,7 +192,7 @@ 
      OPENJDK_TARGET_CPU_OSARCH="i386"
    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
      # On all platforms except macosx, we replace x86_64 with amd64.
-@@ -14570,7 +14614,7 @@
+@@ -8017,7 +8060,7 @@
      INCLUDE_SA=false
    fi
    if test "x$VAR_CPU" = xppc64 ; then
@@ -265,7 +201,7 @@ 
    fi
    if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
      INCLUDE_SA=false
-@@ -19744,6 +19788,24 @@
+@@ -11206,6 +11249,24 @@
  
    ###############################################################################
    #
@@ -290,20 +226,67 @@ 
    # Enable or disable the elliptic curve crypto implementation
    #
  
-@@ -37332,7 +37394,7 @@
+@@ -19429,6 +19490,8 @@
+   elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
+     # Do not probe for cc on AIX.
+     COMPILER_CHECK_LIST="xlc_r"
++  elif test "`uname -s`" = "FreeBSD"; then
++    COMPILER_CHECK_LIST="cc gcc"
+   else
+     COMPILER_CHECK_LIST="gcc cc"
+   fi
+@@ -20389,7 +20452,7 @@
+   else
+     COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
+     # Check that this is likely to be GCC.
+-    $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
++    $COMPILER --version 2>&1 | $GREP -E "(Free Software Foundation|clang)" > /dev/null
+     if test $? -ne 0; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5
+ $as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;}
+@@ -21991,7 +22054,7 @@
+   else
+     COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
+     # Check that this is likely to be GCC.
+-    $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
++    $COMPILER --version 2>&1 | $GREP -E "(Free Software Foundation|clang)" > /dev/null
+     if test $? -ne 0; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5
+ $as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;}
+@@ -28026,7 +28089,7 @@
  
    # objcopy is used for moving debug symbols to separate files when
    # full debug symbols are enabled.
 -  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
 +  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xbsd ; then
- 
- 
-   # Publish this variable in the help.
-@@ -40009,8 +40071,31 @@
- 
+     if test -n "$ac_tool_prefix"; then
+   for ac_prog in gobjcopy objcopy
+   do
+@@ -29383,8 +29446,10 @@
+       SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
+       SET_SHARED_LIBRARY_MAPFILE=''
+       SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
++      POST_STRIP_CMD="$STRIP -S"
++    fi
++    if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
+       SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
+-      POST_STRIP_CMD="$STRIP -S"
+     fi
+   else
+     if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+@@ -29731,7 +29796,7 @@
+   #
+   case $COMPILER_NAME in
+     gcc )
+-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
++      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \
+       -pipe \
+       -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
+       CXXSTD_CXXFLAG="-std=gnu++98"
+@@ -30073,22 +30138,36 @@
+   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64"
  
    # The package path is used only on macosx?
--  # FIXME: clean this up, and/or move it elsewhere.
 -  PACKAGE_PATH=/opt/local
 +
 +# Check whether --with-package-path was given.
@@ -329,65 +312,83 @@ 
 +      PACKAGE_PATH=/usr/local
 +    fi
 +  fi
-+
- 
  
-   # Check for extra potential brokenness.
-@@ -41117,7 +41202,7 @@
-   # How to compile shared libraries.
-   #
  
--  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-     PICFLAG="-fPIC"
-     C_FLAG_REORDER=''
-     CXX_FLAG_REORDER=''
-@@ -41196,7 +41281,7 @@
-   # fi
- 
-   # Generate make dependency files
--  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-     C_FLAG_DEPS="-MMD -MF"
-   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
-     C_FLAG_DEPS="-xMMD -xMF"
-@@ -41208,7 +41293,7 @@
- 
- 
-   # Debug symbols
--  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-     if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
-       CFLAGS_DEBUG_SYMBOLS="-g1"
-       CXXFLAGS_DEBUG_SYMBOLS="-g1"
-@@ -41257,7 +41342,7 @@
-   else
-     # The remaining toolchains share opt flags between CC and CXX;
-     # setup for C and duplicate afterwards.
--    if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-       if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-         # On MacOSX we optimize for size, something
-         # we should do for all platforms?
-@@ -41411,7 +41496,7 @@
- 
-   # Setup compiler/platform specific flags to CFLAGS_JDK,
-   # CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?)
--  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-     # these options are used for both C and C++ compiles
-     CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \
-         -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
-@@ -41830,7 +41915,7 @@
+   if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
+-    # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
+-    #   Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
+-    #   (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h).
+-    #   Note: -Dmacro         is the same as    #define macro 1
+-    #         -Dmacro=        is the same as    #define macro
+-    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
+-    else
+-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
+-    fi
+-  else
+-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
++    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN"
++  else
++    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_BIG_ENDIAN"
+   fi
+   if test "x$OPENJDK_TARGET_OS" = xlinux; then
+     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
+@@ -30118,6 +30197,38 @@
+   fi
+   if test "x$OPENJDK_TARGET_OS" = xbsd; then
+     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
++    if test "`uname -s`" = "OpenBSD"; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld requires -z wxneeded" >&5
++$as_echo_n "checking if ld requires -z wxneeded... " >&6; }
++        if test "$cross_compiling" = yes; then :
++
++              { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/mman.h>
++int main() { return mmap(0, 4096, PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0) != MAP_FAILED; }
++_ACEOF
++if ac_fn_cxx_try_run "$LINENO"; then :
++
++              { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++              LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,wxneeded"
++
++else
++
++              { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++    fi
+   fi
+   if test "x$DEBUG_LEVEL" = xrelease; then
+     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG"
+@@ -30187,6 +30298,15 @@
+           # Should this be supplied to the OSS linker as well?
+           LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
+         fi
++      elif test "x$OPENJDK_TARGET_OS" = xbsd; then
++        # And since we now know that the linker is gnu, then add:
++        #   -z noexecstack, to mark stack regions as non-executable
++        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker noexecstack"
++        if test "x$DEBUG_LEVEL" = "xrelease"; then
++          # When building release libraries, tell the linker optimize them.
++          # Should this be supplied to the OSS linker as well?
++          LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
++        fi
+       fi
      fi
-     LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
-   else
--    if test "x$TOOLCHAIN_TYPE" = xgcc; then
-+    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-       # If this is a --hash-style=gnu system, use --hash-style=both, why?
-       # We have previously set HAS_GNU_HASH if this is the case
-       if test -n "$HAS_GNU_HASH"; then
-@@ -42366,11 +42451,18 @@
+     LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
+@@ -30641,11 +30761,18 @@
    fi
  
    if test "x$OPENJDK_TARGET_OS" = xbsd; then
@@ -411,47 +412,31 @@ 
    fi
  
    if test "x$OPENJDK" = "xfalse"; then
-@@ -42405,21 +42497,25 @@
-   # Make a simple check for the libraries at the sysroot, and setup --x-includes and
+@@ -30681,14 +30808,18 @@
    # --x-libraries for the sysroot, if that seems to be correct.
-   if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
--    if test "x$SYSROOT" != "x"; then
-+    if test "x$SYS_ROOT" != "x/"; then
-       if test "x$x_includes" = xNONE; then
--        if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then
--          x_includes="$SYSROOT/usr/X11R6/include"
--        elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then
--          x_includes="$SYSROOT/usr/include"
-+        if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then
-+          x_includes="$SYS_ROOT/usr/X11R7/include"
-+        elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
-+          x_includes="$SYS_ROOT/usr/X11R6/include"
-+        elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
-+          x_includes="$SYS_ROOT/usr/include"
-         fi
-       fi
-       if test "x$x_libraries" = xNONE; then
--        if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then
--          x_libraries="$SYSROOT/usr/X11R6/lib"
--        elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
--          x_libraries="$SYSROOT/usr/lib64"
--        elif test -f "$SYSROOT/usr/lib/libX11.so"; then
--          x_libraries="$SYSROOT/usr/lib"
-+        if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then
-+          x_libraries="$SYS_ROOT/usr/X11R7/lib"
-+        elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
-+          x_libraries="$SYS_ROOT/usr/X11R6/lib"
-+        elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-+          x_libraries="$SYS_ROOT/usr/lib64"
-+        elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then
-+          x_libraries="$SYS_ROOT/usr/lib"
-         fi
+   if test "x$SYS_ROOT" != "x/"; then
+     if test "x$x_includes" = xNONE; then
+-      if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
++      if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then
++        x_includes="$SYS_ROOT/usr/X11R7/include"
++      elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
+         x_includes="$SYS_ROOT/usr/X11R6/include"
+       elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
+         x_includes="$SYS_ROOT/usr/include"
        fi
      fi
-@@ -43466,6 +43562,10 @@
+     if test "x$x_libraries" = xNONE; then
+-      if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
++      if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then
++        x_libraries="$SYS_ROOT/usr/X11R7/lib"
++      elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
+         x_libraries="$SYS_ROOT/usr/X11R6/lib"
+       elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+         x_libraries="$SYS_ROOT/usr/lib64"
+@@ -31735,6 +31866,10 @@
          # A CSW package seems to be installed!
          CUPS_FOUND=yes
-         CUPS_CFLAGS="-I$SYSROOT/opt/csw/include"
+         CUPS_CFLAGS="-I/opt/csw/include"
 +      elif test -s ${PACKAGE_PATH}/include/cups/cups.h; then
 +        # Standard package location for BSD
 +        CUPS_FOUND=yes
@@ -459,7 +444,7 @@ 
        fi
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5
  $as_echo "$CUPS_FOUND" >&6; }
-@@ -47351,7 +47451,7 @@
+@@ -34900,7 +35035,7 @@
  
    ###############################################################################
    #
@@ -468,7 +453,7 @@ 
    #
  
  # Check whether --with-alsa was given.
-@@ -47762,15 +47862,66 @@
+@@ -35308,15 +35443,66 @@
  
    if test "x${with_giflib}" = "xbundled"; then
      USE_EXTERNAL_LIBGIF=false
@@ -540,7 +525,7 @@ 
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5
  $as_echo_n "checking for DGifGetCode in -lgif... " >&6; }
  if ${ac_cv_lib_gif_DGifGetCode+:} false; then :
-@@ -47808,16 +47959,96 @@
+@@ -35354,16 +35540,96 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5
  $as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; }
  if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then :
@@ -647,7 +632,7 @@ 
  
      USE_EXTERNAL_LIBGIF=true
    else
-@@ -47825,6 +48056,8 @@
+@@ -35371,6 +35637,8 @@
    fi
  
  
@@ -656,7 +641,7 @@ 
    ###############################################################################
    #
    # Check for the zlib library
-@@ -48392,6 +48625,11 @@
+@@ -35938,6 +36206,11 @@
      LIBCXX="-lstdc++"
    fi
  
@@ -668,7 +653,7 @@ 
  
  
  
-@@ -51078,6 +51316,10 @@
+@@ -36011,6 +36284,10 @@
      # Looks like a MacOSX system
      NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk  '{print $5}'`
      FOUND_CORES=yes
@@ -679,7 +664,7 @@ 
    elif test "x$OPENJDK_BUILD_OS" = xaix ; then
      NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'`
      FOUND_CORES=yes
-@@ -51133,6 +51375,15 @@
+@@ -36066,6 +36343,15 @@
      MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk  '{print $2}'`
      MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024`
      FOUND_MEM=yes
@@ -695,7 +680,7 @@ 
    elif test "x$OPENJDK_BUILD_OS" = xwindows; then
      # Windows, but without cygwin
      MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
-@@ -51706,8 +51957,8 @@
+@@ -36473,8 +36759,8 @@
      # precompiled headers.
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
  $as_echo_n "checking if ccache supports precompiled headers... " >&6; }
@@ -706,8 +691,8 @@ 
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
  $as_echo "no, disabling ccache" >&6; }
        CCACHE=
---- ./common/autoconf/jdk-options.m4	Sat Oct 06 10:24:47 2018 +0100
-+++ ./common/autoconf/jdk-options.m4	Sat Dec 01 12:25:45 2018 -0800
+--- ./common/autoconf/jdk-options.m4	Sat Jun 23 21:01:22 2018 -0700
++++ ./common/autoconf/jdk-options.m4	Mon Sep 03 11:10:31 2018 -0700
 @@ -159,7 +159,7 @@
      INCLUDE_SA=false
    fi
@@ -738,8 +723,8 @@ 
    # Enable or disable the elliptic curve crypto implementation
    #
    AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
---- ./common/autoconf/libraries.m4	Sat Oct 06 10:24:47 2018 +0100
-+++ ./common/autoconf/libraries.m4	Sat Dec 01 12:25:45 2018 -0800
+--- ./common/autoconf/libraries.m4	Sat Jun 23 21:01:22 2018 -0700
++++ ./common/autoconf/libraries.m4	Mon Sep 03 11:10:31 2018 -0700
 @@ -69,9 +69,15 @@
    fi
  
@@ -759,47 +744,31 @@ 
    fi
  
    if test "x$OPENJDK" = "xfalse"; then
-@@ -98,21 +104,25 @@
-   # Make a simple check for the libraries at the sysroot, and setup --x-includes and
+@@ -99,14 +105,18 @@
    # --x-libraries for the sysroot, if that seems to be correct.
-   if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
--    if test "x$SYSROOT" != "x"; then
-+    if test "x$SYS_ROOT" != "x/"; then
-       if test "x$x_includes" = xNONE; then
--        if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then
--          x_includes="$SYSROOT/usr/X11R6/include"
--        elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then
--          x_includes="$SYSROOT/usr/include"
-+        if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then
-+          x_includes="$SYS_ROOT/usr/X11R7/include"
-+        elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
-+          x_includes="$SYS_ROOT/usr/X11R6/include"
-+        elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
-+          x_includes="$SYS_ROOT/usr/include"
-         fi
-       fi
-       if test "x$x_libraries" = xNONE; then
--        if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then
--          x_libraries="$SYSROOT/usr/X11R6/lib"
--        elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
--          x_libraries="$SYSROOT/usr/lib64"
--        elif test -f "$SYSROOT/usr/lib/libX11.so"; then
--          x_libraries="$SYSROOT/usr/lib"
-+        if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then
-+          x_libraries="$SYS_ROOT/usr/X11R7/lib"
-+        elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
-+          x_libraries="$SYS_ROOT/usr/X11R6/lib"
-+        elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-+          x_libraries="$SYS_ROOT/usr/lib64"
-+        elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then
-+          x_libraries="$SYS_ROOT/usr/lib"
-         fi
+   if test "x$SYS_ROOT" != "x/"; then
+     if test "x$x_includes" = xNONE; then
+-      if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
++      if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then
++        x_includes="$SYS_ROOT/usr/X11R7/include"
++      elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
+         x_includes="$SYS_ROOT/usr/X11R6/include"
+       elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
+         x_includes="$SYS_ROOT/usr/include"
        fi
      fi
-@@ -238,6 +248,10 @@
+     if test "x$x_libraries" = xNONE; then
+-      if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
++      if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then
++        x_libraries="$SYS_ROOT/usr/X11R7/lib"
++      elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
+         x_libraries="$SYS_ROOT/usr/X11R6/lib"
+       elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+         x_libraries="$SYS_ROOT/usr/lib64"
+@@ -232,6 +242,10 @@
          # A CSW package seems to be installed!
          CUPS_FOUND=yes
-         CUPS_CFLAGS="-I$SYSROOT/opt/csw/include"
+         CUPS_CFLAGS="-I/opt/csw/include"
 +      elif test -s ${PACKAGE_PATH}/include/cups/cups.h; then
 +        # Standard package location for BSD
 +        CUPS_FOUND=yes
@@ -807,7 +776,7 @@ 
        fi
        AC_MSG_RESULT([$CUPS_FOUND])
      fi
-@@ -638,7 +652,7 @@
+@@ -525,7 +539,7 @@
  
    ###############################################################################
    #
@@ -816,7 +785,7 @@ 
    #
    AC_ARG_WITH(alsa, [AS_HELP_STRING([--with-alsa],
        [specify prefix directory for the alsa package
-@@ -743,17 +757,61 @@
+@@ -627,17 +641,61 @@
  
    if test "x${with_giflib}" = "xbundled"; then
      USE_EXTERNAL_LIBGIF=false
@@ -882,7 +851,7 @@ 
  
    ###############################################################################
    #
-@@ -988,6 +1046,11 @@
+@@ -872,5 +930,10 @@
      LIBCXX="-lstdc++"
    fi
  
@@ -893,9 +862,8 @@ 
 +
    AC_SUBST(LIBCXX)
  ])
- 
---- ./common/autoconf/platform.m4	Sat Oct 06 10:24:47 2018 +0100
-+++ ./common/autoconf/platform.m4	Sat Dec 01 12:25:45 2018 -0800
+--- ./common/autoconf/platform.m4	Sat Jun 23 21:01:22 2018 -0700
++++ ./common/autoconf/platform.m4	Mon Sep 03 11:10:31 2018 -0700
 @@ -30,7 +30,7 @@
  [
    # First argument is the cpu name from the trip/quad
@@ -928,7 +896,7 @@ 
  ])
  
  # Expects $host_os $host_cpu $build_os and $build_cpu
-@@ -193,6 +209,7 @@
+@@ -192,6 +208,7 @@
    PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
    # ... and setup our own variables. (Do this explicitely to facilitate searching)
    OPENJDK_TARGET_OS="$VAR_OS"
@@ -936,15 +904,15 @@ 
    OPENJDK_TARGET_OS_API="$VAR_OS_API"
    OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
    OPENJDK_TARGET_CPU="$VAR_CPU"
-@@ -200,6 +217,7 @@
+@@ -199,6 +216,7 @@
    OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
    OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
    AC_SUBST(OPENJDK_TARGET_OS)
 +  AC_SUBST(OPENJDK_TARGET_OS_VENDOR)
    AC_SUBST(OPENJDK_TARGET_OS_API)
-   AC_SUBST(OPENJDK_TARGET_OS_ENV)
    AC_SUBST(OPENJDK_TARGET_CPU)
-@@ -310,8 +328,8 @@
+   AC_SUBST(OPENJDK_TARGET_CPU_ARCH)
+@@ -308,8 +326,8 @@
  
    # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
    OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
@@ -955,9 +923,9 @@ 
      OPENJDK_TARGET_CPU_OSARCH="i386"
    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
      # On all platforms except macosx, we replace x86_64 with amd64.
---- ./common/autoconf/spec.gmk.in	Sat Oct 06 10:24:47 2018 +0100
-+++ ./common/autoconf/spec.gmk.in	Sat Dec 01 12:25:45 2018 -0800
-@@ -79,6 +79,7 @@
+--- ./common/autoconf/spec.gmk.in	Sat Jun 23 21:01:22 2018 -0700
++++ ./common/autoconf/spec.gmk.in	Mon Sep 03 11:10:31 2018 -0700
+@@ -76,6 +76,7 @@
  OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
  OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@
  OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@
@@ -965,7 +933,7 @@ 
  
  OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
  OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
-@@ -281,7 +282,7 @@
+@@ -276,7 +277,7 @@
  ALSA_LIBS:=@ALSA_LIBS@
  ALSA_CFLAGS:=@ALSA_CFLAGS@
  
@@ -974,7 +942,7 @@ 
  
  # Source file for cacerts
  CACERTS_FILE=@CACERTS_FILE@
-@@ -289,6 +290,9 @@
+@@ -284,6 +285,9 @@
  # Enable unlimited crypto policy
  UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
  
@@ -984,7 +952,7 @@ 
  # Necessary additional compiler flags to compile X11
  X_CFLAGS:=@X_CFLAGS@
  X_LIBS:=@X_LIBS@
-@@ -571,6 +575,8 @@
+@@ -568,6 +572,8 @@
  ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
  USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
  USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
@@ -993,30 +961,60 @@ 
  USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
  LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
  MSVCR_DLL:=@MSVCR_DLL@
---- ./common/autoconf/toolchain.m4	Sat Oct 06 10:24:47 2018 +0100
-+++ ./common/autoconf/toolchain.m4	Sat Dec 01 12:25:45 2018 -0800
-@@ -37,6 +37,7 @@
- VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft"
- 
- # These toolchains are valid on different platforms
-+VALID_TOOLCHAINS_bsd="clang gcc"
- VALID_TOOLCHAINS_linux="gcc clang"
- VALID_TOOLCHAINS_solaris="solstudio"
- VALID_TOOLCHAINS_macosx="gcc clang"
-@@ -713,7 +714,7 @@
+--- ./common/autoconf/toolchain.m4	Sat Jun 23 21:01:22 2018 -0700
++++ ./common/autoconf/toolchain.m4	Mon Sep 03 11:10:31 2018 -0700
+@@ -122,7 +122,7 @@
+   else
+     COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
+     # Check that this is likely to be GCC.
+-    $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
++    $COMPILER --version 2>&1 | $GREP -E "(Free Software Foundation|clang)" > /dev/null
+     if test $? -ne 0; then
+       AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler.])
+       AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_TEST"])
+@@ -401,6 +401,8 @@
+   elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
+     # Do not probe for cc on AIX.
+     COMPILER_CHECK_LIST="xlc_r"
++  elif test "`uname -s`" = "FreeBSD"; then
++    COMPILER_CHECK_LIST="cc gcc"
+   else
+     COMPILER_CHECK_LIST="gcc cc"
+   fi
+@@ -629,7 +631,7 @@
  
    # objcopy is used for moving debug symbols to separate files when
    # full debug symbols are enabled.
 -  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
 +  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xbsd ; then
-     BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
+     AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
      # Only call fixup if objcopy was found.
      if test -n "$OBJCOPY"; then
-@@ -801,8 +802,27 @@
- AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
-  [
+@@ -692,8 +694,10 @@
+       SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1'
+       SET_SHARED_LIBRARY_MAPFILE=''
+       SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
++      POST_STRIP_CMD="$STRIP -S"
++    fi
++    if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
+       SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
+-      POST_STRIP_CMD="$STRIP -S"
+     fi
+   else
+     if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+@@ -1018,7 +1022,7 @@
+   #
+   case $COMPILER_NAME in
+     gcc )
+-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
++      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \
+       -pipe \
+       -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
+       CXXSTD_CXXFLAG="-std=gnu++98"
+@@ -1106,22 +1110,33 @@
+   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64"
+ 
    # The package path is used only on macosx?
--  # FIXME: clean this up, and/or move it elsewhere.
 -  PACKAGE_PATH=/opt/local
 +  AC_ARG_WITH(package-path, [AS_HELP_STRING([--with-package-path],
 +      [package path to be used for location of third party packages])])
@@ -1041,17 +1039,73 @@ 
 +
    AC_SUBST(PACKAGE_PATH)
  
-   # Check for extra potential brokenness.
---- ./configure	Sat Oct 06 10:24:47 2018 +0100
-+++ ./configure	Sat Dec 01 12:25:45 2018 -0800
+   if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
+-    # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
+-    #   Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
+-    #   (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h).
+-    #   Note: -Dmacro         is the same as    #define macro 1
+-    #         -Dmacro=        is the same as    #define macro
+-    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
+-    else
+-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
+-    fi
++    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN"
+   else
+-    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
++    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_BIG_ENDIAN"
+   fi
+   if test "x$OPENJDK_TARGET_OS" = xlinux; then
+     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
+@@ -1151,6 +1166,22 @@
+   fi
+   if test "x$OPENJDK_TARGET_OS" = xbsd; then
+     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
++    if test "`uname -s`" = "OpenBSD"; then
++        AC_MSG_CHECKING([if ld requires -z wxneeded])
++        AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/mman.h>
++int main() { return mmap(0, 4096, PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0) != MAP_FAILED; }]])],
++            [
++              AC_MSG_RESULT([yes])
++              LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,wxneeded"
++            ],
++            [
++              AC_MSG_RESULT([no])
++            ],
++            [
++              AC_MSG_RESULT([no])
++            ]
++        )
++    fi
+   fi
+   if test "x$DEBUG_LEVEL" = xrelease; then
+     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG"
+@@ -1220,6 +1251,15 @@
+           # Should this be supplied to the OSS linker as well?
+           LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
+         fi
++      elif test "x$OPENJDK_TARGET_OS" = xbsd; then
++        # And since we now know that the linker is gnu, then add:
++        #   -z noexecstack, to mark stack regions as non-executable
++        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker noexecstack"
++        if test "x$DEBUG_LEVEL" = "xrelease"; then
++          # When building release libraries, tell the linker optimize them.
++          # Should this be supplied to the OSS linker as well?
++          LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
++        fi
+       fi
+     fi
+     LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
+--- ./configure	Sat Jun 23 21:01:22 2018 -0700
++++ ./configure	Mon Sep 03 11:10:31 2018 -0700
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  #
- # Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
---- ./make/Javadoc.gmk	Sat Oct 06 10:24:47 2018 +0100
-+++ ./make/Javadoc.gmk	Sat Dec 01 12:25:45 2018 -0800
+--- ./make/Javadoc.gmk	Sat Jun 23 21:01:22 2018 -0700
++++ ./make/Javadoc.gmk	Mon Sep 03 11:10:31 2018 -0700
 @@ -46,8 +46,18 @@
  
  BUILD_NUMBER=$(JDK_BUILD_NUMBER)
@@ -1072,8 +1126,8 @@ 
      -Djava.awt.headless=true \
      $(NEW_JAVADOC) \
      -bootclasspath $(JDK_OUTPUTDIR)/classes
---- ./make/Main.gmk	Sat Oct 06 10:24:47 2018 +0100
-+++ ./make/Main.gmk	Sat Dec 01 12:25:45 2018 -0800
+--- ./make/Main.gmk	Sat Jun 23 21:01:22 2018 -0700
++++ ./make/Main.gmk	Mon Sep 03 11:10:31 2018 -0700
 @@ -58,7 +58,11 @@
  
  # Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
@@ -1086,8 +1140,8 @@ 
  
  ### Main targets
  
---- ./make/common/MakeBase.gmk	Sat Oct 06 10:24:47 2018 +0100
-+++ ./make/common/MakeBase.gmk	Sat Dec 01 12:25:45 2018 -0800
+--- ./make/common/MakeBase.gmk	Sat Jun 23 21:01:22 2018 -0700
++++ ./make/common/MakeBase.gmk	Mon Sep 03 11:10:31 2018 -0700
 @@ -338,7 +338,7 @@
      # (and causing a crash on Cygwin).
      # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
@@ -1108,9 +1162,9 @@ 
  endef
  
  # Make directory without forking mkdir if not needed
---- ./make/common/NativeCompilation.gmk	Sat Oct 06 10:24:47 2018 +0100
-+++ ./make/common/NativeCompilation.gmk	Sat Dec 01 12:25:45 2018 -0800
-@@ -158,9 +158,9 @@
+--- ./make/common/NativeCompilation.gmk	Sat Jun 23 21:01:22 2018 -0700
++++ ./make/common/NativeCompilation.gmk	Mon Sep 03 11:10:31 2018 -0700
+@@ -151,9 +151,9 @@
    #   CC the compiler to use, default is $(CC)
    #   LDEXE the linker to use for linking executables, default is $(LDEXE)
    #   OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
@@ -1123,8 +1177,8 @@ 
  
    ifneq (,$$($1_BIN))
      $$(error BIN has been replaced with OBJECT_DIR)
---- ./hotspot/agent/make/Makefile	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/make/Makefile	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/make/Makefile	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/make/Makefile	Mon Sep 03 11:13:04 2018 -0700
 @@ -50,6 +50,7 @@
  sun.jvm.hotspot.debugger.amd64 \
  sun.jvm.hotspot.debugger.bsd \
@@ -1203,8 +1257,8 @@ 
  sun/jvm/hotspot/runtime/solaris_amd64/*.java \
  sun/jvm/hotspot/runtime/solaris_sparc/*.java \
  sun/jvm/hotspot/runtime/solaris_x86/*.java \
---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c	Mon Sep 03 11:13:04 2018 -0700
 @@ -42,6 +42,10 @@
  #include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h"
  #endif
@@ -1273,8 +1327,8 @@ 
  
    (*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT);
    return array;
---- ./hotspot/agent/src/os/bsd/Makefile	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/os/bsd/Makefile	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/os/bsd/Makefile	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/os/bsd/Makefile	Mon Sep 03 11:13:04 2018 -0700
 @@ -85,6 +85,9 @@
    LFLAGS_LIBSA = -Xlinker --version-script=mapfile
  endif
@@ -1285,8 +1339,8 @@ 
  $(LIBSA): $(OBJSPLUS) mapfile 
  	if [ ! -d $(ARCH) ] ; then mkdir $(ARCH) ; fi
  	$(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(FOUNDATIONFLAGS) $(OBJSPLUS) $(LIBS) $(SALIBS)
---- ./hotspot/agent/src/os/bsd/elfmacros.h	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/os/bsd/elfmacros.h	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/os/bsd/elfmacros.h	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/os/bsd/elfmacros.h	Mon Sep 03 11:13:04 2018 -0700
 @@ -34,6 +34,7 @@
  #define ELF_SYM         Elf64_Sym
  #define ELF_DYN         Elf64_Dyn
@@ -1303,8 +1357,8 @@ 
  
  #ifndef ELF_ST_TYPE
  #define ELF_ST_TYPE     ELF32_ST_TYPE
---- ./hotspot/agent/src/os/bsd/ps_core.c	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/os/bsd/ps_core.c	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/os/bsd/ps_core.c	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/os/bsd/ps_core.c	Mon Sep 03 11:13:04 2018 -0700
 @@ -1091,6 +1091,18 @@
          if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true) {
            return false;
@@ -1351,8 +1405,8 @@ 
      goto err;
    }
  
---- ./hotspot/agent/src/os/bsd/symtab.c	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/os/bsd/symtab.c	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/os/bsd/symtab.c	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/os/bsd/symtab.c	Mon Sep 03 11:13:04 2018 -0700
 @@ -211,6 +211,10 @@
  
    // Reading of elf header
@@ -1393,8 +1447,8 @@ 
  
          key.data = sym_name;
          key.size = strlen(sym_name) + 1;
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -33,6 +33,7 @@
  import sun.jvm.hotspot.debugger.JVMDebugger;
  import sun.jvm.hotspot.debugger.MachineDescription;
@@ -1413,7 +1467,7 @@ 
              if (LinuxDebuggerLocal.getAddressSize()==8) {
                      machDesc = new MachineDescriptionSPARC64Bit();
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1458,8 +1512,8 @@ 
 +      return false;
 +  }
 +}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -30,8 +30,10 @@
  import sun.jvm.hotspot.debugger.cdbg.*;
  import sun.jvm.hotspot.debugger.x86.*;
@@ -1485,8 +1539,8 @@ 
      } else {
         throw new DebuggerException(cpu + " is not yet supported");
      }
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -27,6 +27,7 @@
  import sun.jvm.hotspot.debugger.*;
  import sun.jvm.hotspot.debugger.bsd.amd64.*;
@@ -1505,7 +1559,7 @@ 
           throw new RuntimeException("cpu " + cpu + " is not yet supported");
        }
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,79 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1587,7 +1641,7 @@ 
 +  private BsdDebugger dbg;
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1636,7 +1690,7 @@ 
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,123 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1761,8 +1815,8 @@ 
 +  public abstract Address getRegisterAsAddress(int index);
 +
 +}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -32,7 +32,9 @@
  import sun.jvm.hotspot.debugger.cdbg.*;
  import sun.jvm.hotspot.debugger.proc.amd64.*;
@@ -1785,7 +1839,7 @@ 
            try {
              Class tfc = Class.forName("sun.jvm.hotspot.debugger.proc." +
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,86 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1874,7 +1928,7 @@ 
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1923,7 +1977,7 @@ 
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,44 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1969,8 +2023,8 @@ 
 +    return new ProcPPC64Thread(debugger, id);
 +  }
 +}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -33,6 +33,7 @@
  import sun.jvm.hotspot.debugger.remote.sparc.*;
  import sun.jvm.hotspot.debugger.remote.x86.*;
@@ -1992,7 +2046,7 @@ 
          try {
            Class tf = Class.forName("sun.jvm.hotspot.debugger.remote." +
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,53 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2048,7 +2102,7 @@ 
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2101,7 +2155,7 @@ 
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,44 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2147,8 +2201,8 @@ 
 +    return new RemotePPC64Thread(debugger, id);
 +  }
 +}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -37,6 +37,7 @@
  import sun.jvm.hotspot.runtime.linux_sparc.LinuxSPARCJavaThreadPDAccess;
  import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess;
@@ -2167,7 +2221,7 @@ 
          } else if (os.equals("darwin")) {
              if (cpu.equals("amd64") || cpu.equals("x86_64")) {
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,132 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2302,7 +2356,7 @@ 
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,176 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2481,7 +2535,7 @@ 
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,508 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2992,7 +3046,7 @@ 
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -3038,7 +3092,7 @@ 
 +
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,51 @@
 +/*
 + * Copyright (c) 20014, Oracle and/or its affiliates. All rights reserved.
@@ -3091,8 +3145,8 @@ 
 +  protected void initializeFromPD(RegisterMap map) {}
 +  protected Address getLocationPD(VMReg reg) { return null; }
 +}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -61,7 +61,7 @@
        return "x86";
      } else if (cpu.equals("sparc") || cpu.equals("sparcv9")) {
@@ -3102,8 +3156,8 @@ 
        return cpu;
      } else {
        try {
---- ./hotspot/make/bsd/Makefile	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/Makefile	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/Makefile	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/Makefile	Mon Sep 03 11:13:04 2018 -0700
 @@ -66,6 +66,10 @@
      FORCE_TIERED=1
    endif
@@ -3115,8 +3169,8 @@ 
  
  ifdef LP64
    ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","")
---- ./hotspot/make/bsd/makefiles/build_vm_def.sh	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/build_vm_def.sh	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh	Mon Sep 03 11:13:04 2018 -0700
 @@ -1,12 +1,28 @@
  #!/bin/sh
  
@@ -3152,8 +3206,8 @@ 
 +        if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
 +    }' | sort -u ;;
 +esac
---- ./hotspot/make/bsd/makefiles/debug.make	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/debug.make	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/debug.make	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/debug.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -35,7 +35,10 @@
  # to inhibit the effect of the previous line on CFLAGS.
  
@@ -3166,8 +3220,8 @@ 
  
  VERSION = debug
  SYSDEFS += -DASSERT
---- ./hotspot/make/bsd/makefiles/defs.make	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/defs.make	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/defs.make	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/defs.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -29,7 +29,15 @@
  SLASH_JAVA ?= /java
  
@@ -3266,8 +3320,8 @@ 
  ADD_SA_BINARIES/ia64  =
  ADD_SA_BINARIES/arm   =
  ADD_SA_BINARIES/zero  =
---- ./hotspot/make/bsd/makefiles/fastdebug.make	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/fastdebug.make	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/fastdebug.make	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/fastdebug.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -56,7 +56,10 @@
  # to inhibit the effect of the previous line on CFLAGS.
  
@@ -3280,8 +3334,8 @@ 
  
  VERSION = fastdebug
  SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
---- ./hotspot/make/bsd/makefiles/gcc.make	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/gcc.make	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/gcc.make	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/gcc.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -168,6 +168,9 @@
    CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
  endif
@@ -3438,8 +3492,19 @@ 
    endif
  endif
  
+--- ./hotspot/make/bsd/makefiles/jsig.make	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/jsig.make	Mon Sep 03 11:13:04 2018 -0700
+@@ -52,7 +52,7 @@
+ # cause problems with interposing. See CR: 6466665
+ # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
+ 
+-LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE)
++LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK)
+ 
+ # DEBUG_BINARIES overrides everything, use full -g debug information
+ ifeq ($(DEBUG_BINARIES), true)
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/launcher.make	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/make/bsd/makefiles/launcher.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,117 @@
 +#
 +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -3558,8 +3623,8 @@ 
 +	$(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@
 +	$(QUIETLY) chmod +x $@
 +
---- ./hotspot/make/bsd/makefiles/mapfile-vers-debug	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug	Mon Sep 03 11:13:04 2018 -0700
 @@ -21,246 +21,254 @@
  # questions.
  #
@@ -4047,7 +4112,7 @@ 
 +                *;
 +};
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,266 @@
 +#
 +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -4315,8 +4380,8 @@ 
 +
 +                # INSERT VTABLE SYMBOLS HERE
 +
---- ./hotspot/make/bsd/makefiles/mapfile-vers-product	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product	Mon Sep 03 11:13:04 2018 -0700
 @@ -21,241 +21,249 @@
  # questions.
  #
@@ -4795,7 +4860,7 @@ 
 +                *;
 +};
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,261 @@
 +#
 +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -5058,8 +5123,8 @@ 
 +
 +                # INSERT VTABLE SYMBOLS HERE
 +
---- ./hotspot/make/bsd/makefiles/optimized.make	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/optimized.make	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/optimized.make	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/optimized.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -38,6 +38,9 @@
  # to inhibit the effect of the previous line on CFLAGS.
  
@@ -5072,7 +5137,7 @@ 
  
  VERSION = optimized
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/ppc64.make	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/make/bsd/makefiles/ppc64.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,51 @@
 +#
 +# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -5125,8 +5190,8 @@ 
 +  # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
 +  CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string
 +endif
---- ./hotspot/make/bsd/makefiles/product.make	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/product.make	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/product.make	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/product.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -38,7 +38,10 @@
  # to inhibit the effect of the previous line on CFLAGS.
  
@@ -5139,8 +5204,8 @@ 
  
  SYSDEFS += -DPRODUCT
  VERSION = optimized
---- ./hotspot/make/bsd/makefiles/rules.make	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/rules.make	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/rules.make	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/rules.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -34,7 +34,7 @@
  CC_COMPILE       = $(CC) $(CXXFLAGS) $(CFLAGS)
  CXX_COMPILE      = $(CXX) $(CXXFLAGS) $(CFLAGS)
@@ -5150,8 +5215,8 @@ 
  
  COMPILE.CC       = $(CC_COMPILE) -c
  GENASM.CC        = $(CC_COMPILE) -S
---- ./hotspot/make/bsd/makefiles/sa.make	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/sa.make	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/sa.make	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/sa.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -1,5 +1,5 @@
  #
 -# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -5266,8 +5331,8 @@ 
  	rm -rf $(AGENT_FILES_LIST)
 +
 +-include $(HS_ALT_MAKE)/bsd/makefiles/sa-rules.make
---- ./hotspot/make/bsd/makefiles/saproc.make	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/saproc.make	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/saproc.make	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/saproc.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -99,10 +99,10 @@
  endif
  
@@ -5307,8 +5372,8 @@ 
 +	 cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"
  
  .PHONY: install_saproc
---- ./hotspot/make/bsd/makefiles/vm.make	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/bsd/makefiles/vm.make	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/bsd/makefiles/vm.make	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/bsd/makefiles/vm.make	Mon Sep 03 11:13:04 2018 -0700
 @@ -107,7 +107,7 @@
  # File specific flags
  CXXFLAGS += $(CXXFLAGS/BYFILE)
@@ -5318,19 +5383,8 @@ 
  CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
  endif
  
-@@ -130,9 +130,7 @@
- 
- LIBS += -lm
- 
--ifeq ($(USE_CLANG),)
--  LIBS += -pthread
--endif
-+LIBS += -pthread
- 
- # By default, link the *.o into the library, not the executable.
- LINK_INTO$(LINK_INTO) = LIBJVM
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/platform_ppc64	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/make/bsd/platform_ppc64	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,17 @@
 +os_family = bsd
 +
@@ -5349,8 +5403,8 @@ 
 +gnu_dis_arch = ppc64
 +
 +sysdefs = -DBSD -D_ALLBSD_SOURCE -D_GNU_SOURCE -DPPC64
---- ./hotspot/make/sa.files	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/make/sa.files	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/make/sa.files	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/make/sa.files	Mon Sep 03 11:13:04 2018 -0700
 @@ -45,6 +45,7 @@
  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \
  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \
@@ -5391,8 +5445,8 @@ 
  $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/*.java \
  $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/jcore/*.java \
  $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/soql/*.java \
---- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -277,5 +277,9 @@
  #if defined(TARGET_OS_ARCH_linux_ppc)
  #include "bytes_linux_ppc.inline.hpp"
@@ -5403,8 +5457,8 @@ 
 +
  
  #endif // CPU_PPC_VM_BYTES_PPC_HPP
---- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -307,6 +307,8 @@
    // Although AIX runs on big endian CPU, float is in most significant
    // word of an argument slot.
@@ -5414,8 +5468,8 @@ 
  #else
  #error "unknown OS"
  #endif
---- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -780,6 +780,8 @@
        // Although AIX runs on big endian CPU, float is in the most
        // significant word of an argument slot.
@@ -5425,34 +5479,8 @@ 
  #else
  #error "unknown OS"
  #endif
---- ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -650,7 +650,7 @@
- 
-     bind(loop);
-     // check if current entry is used
--    cmpptr(Address(c_rarg1, BasicObjectLock::obj_offset_in_bytes()), (int32_t) NULL);
-+    cmpptr(Address(c_rarg1, BasicObjectLock::obj_offset_in_bytes()), 0);
-     jcc(Assembler::notEqual, exception);
- 
-     addptr(c_rarg1, entry_size); // otherwise advance to next entry
---- ./hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -428,10 +428,10 @@
-     _from -= Interpreter::stackElementSize;
- 
-     if (_num_int_args < Argument::n_int_register_parameters_c-1) {
--      *_int_args++ = (*from_addr == 0) ? NULL : (intptr_t)from_addr;
-+      *_int_args++ = (*from_addr == 0) ? 0L : (intptr_t) from_addr;
-       _num_int_args++;
-     } else {
--      *_to++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr;
-+      *_to++ = (*from_addr == 0) ? 0L : (intptr_t) from_addr;
-     }
-   }
- 
---- ./hotspot/src/cpu/x86/vm/jni_x86.h	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/cpu/x86/vm/jni_x86.h	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/cpu/x86/vm/jni_x86.h	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/cpu/x86/vm/jni_x86.h	Mon Sep 03 11:13:04 2018 -0700
 @@ -34,7 +34,7 @@
  #ifndef __has_attribute
    #define __has_attribute(x) 0
@@ -5462,8 +5490,8 @@ 
    #define JNIEXPORT     __attribute__((visibility("default")))
    #define JNIIMPORT     __attribute__((visibility("default")))
  #else
---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -2266,7 +2266,7 @@
    if (!is_critical_native) {
      // reset handle block
@@ -5473,8 +5501,8 @@ 
  
      // Any exception pending?
      __ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD);
---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -23,9 +23,12 @@
   */
  
@@ -5489,19 +5517,8 @@ 
  #include "asm/macroAssembler.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "code/debugInfoRec.hpp"
---- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -489,7 +489,7 @@
-     // make sure this code is only executed if there is a pending exception
-     {
-       Label L;
--      __ cmpptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t) NULL);
-+      __ cmpptr(Address(r15_thread, Thread::pending_exception_offset()), 0);
-       __ jcc(Assembler::notEqual, L);
-       __ stop("StubRoutines::forward exception: no pending exception (1)");
-       __ bind(L);
---- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -1293,7 +1293,7 @@
  
    // reset handle block
@@ -5511,8 +5528,8 @@ 
  
    // If result was an oop then unbox and save it in the frame
    { Label L;
---- ./hotspot/src/cpu/x86/vm/x86_32.ad	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/cpu/x86/vm/x86_32.ad	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/cpu/x86/vm/x86_32.ad	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/cpu/x86/vm/x86_32.ad	Mon Sep 03 11:13:04 2018 -0700
 @@ -1250,6 +1250,7 @@
  
  
@@ -5521,9 +5538,9 @@ 
  }
  
  #ifndef PRODUCT
---- ./hotspot/src/os/aix/vm/os_aix.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os/aix/vm/os_aix.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -5246,6 +5246,10 @@
+--- ./hotspot/src/os/aix/vm/os_aix.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os/aix/vm/os_aix.cpp	Mon Sep 03 11:13:04 2018 -0700
+@@ -5236,6 +5236,10 @@
      return 0;
    }
  
@@ -5535,7 +5552,7 @@ 
  }
  
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,53 @@
 +/*
 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -5590,8 +5607,8 @@ 
 +  return false;
 +}
 +#endif
---- ./hotspot/src/os/bsd/vm/jsig.c	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os/bsd/vm/jsig.c	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/os/bsd/vm/jsig.c	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os/bsd/vm/jsig.c	Mon Sep 03 11:13:04 2018 -0700
 @@ -165,9 +165,8 @@
  }
  
@@ -5604,8 +5621,8 @@ 
  
  static int call_os_sigaction(int sig, const struct sigaction  *act,
                               struct sigaction *oact) {
---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -50,6 +50,7 @@
      case INTERRUPT_SIGNAL:
      case SIGFPE:
@@ -5715,8 +5732,8 @@ 
 +  jio_snprintf(buf, len, "SIG%s", signame);
 +  return true;
  }
---- ./hotspot/src/os/bsd/vm/jvm_bsd.h	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.h	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h	Mon Sep 03 11:13:04 2018 -0700
 @@ -112,20 +112,6 @@
  #define SHUTDOWN2_SIGNAL SIGINT
  #define SHUTDOWN3_SIGNAL SIGTERM
@@ -5738,8 +5755,8 @@ 
  #endif /* JVM_MD_H */
  
  #endif // OS_BSD_VM_JVM_BSD_H
---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -30,7 +30,7 @@
  
  void OSThread::pd_initialize() {
@@ -5749,8 +5766,8 @@ 
    _thread_id        = 0;
  #else
    _thread_id        = NULL;
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -97,16 +97,31 @@
  # include <sys/shm.h>
  #ifndef __APPLE__
@@ -5972,15 +5989,6 @@ 
  #else
    return (intx)::pthread_self();
  #endif
-@@ -1563,7 +1631,7 @@
-   // Identify compatability class for VM's architecture and library's architecture
-   // Obtain string descriptions for architectures
- 
--  arch_t lib_arch={elf_head.e_machine,0,elf_head.e_ident[EI_CLASS], elf_head.e_ident[EI_DATA], NULL};
-+  arch_t lib_arch={ elf_head.e_machine, 0, (char) elf_head.e_ident[EI_CLASS], (char) elf_head.e_ident[EI_DATA], NULL};
-   int running_arch_index=-1;
- 
-   for (unsigned int i=0 ; i < ARRAY_SIZE(arch_array) ; i++ ) {
 @@ -1691,14 +1759,14 @@
  }
  
@@ -6210,10 +6218,10 @@ 
  #ifdef __APPLE__
    // XXXDARWIN
    // Work around the unaligned VM callbacks in hotspot's
-@@ -3775,6 +3889,20 @@
-     return ActiveProcessorCount;
-   }
+@@ -3765,6 +3879,19 @@
+ };
  
+ int os::active_processor_count() {
 +#ifdef __FreeBSD__
 +  int online_cpus = 0;
 +  cpuset_t mask;
@@ -6227,11 +6235,10 @@ 
 +  if (online_cpus >= 1)
 +    return online_cpus;
 +#endif
-+
    return _processor_count;
  }
  
-@@ -3986,7 +4114,10 @@
+@@ -3976,7 +4103,10 @@
    }
    int fd;
    int o_delete = (oflag & O_DELETE);
@@ -6243,7 +6250,7 @@ 
  
    fd = ::open(path, oflag, mode);
    if (fd == -1) return -1;
-@@ -4031,7 +4162,7 @@
+@@ -4021,7 +4151,7 @@
       * 4843136: (process) pipe file descriptor from Runtime.exec not being closed
       * 6339493: (process) Runtime.exec does not close all file descriptors on Solaris 9
       */
@@ -6252,7 +6259,7 @@ 
      {
          int flags = ::fcntl(fd, F_GETFD);
          if (flags != -1)
-@@ -4171,8 +4302,9 @@
+@@ -4161,8 +4291,9 @@
  #ifdef __APPLE__
    return os::thread_cpu_time(Thread::current(), true /* user + sys */);
  #else
@@ -6264,7 +6271,7 @@ 
  #endif
  }
  
-@@ -4180,8 +4312,9 @@
+@@ -4170,8 +4301,9 @@
  #ifdef __APPLE__
    return os::thread_cpu_time(thread, true /* user + sys */);
  #else
@@ -6276,7 +6283,7 @@ 
  #endif
  }
  
-@@ -4189,8 +4322,9 @@
+@@ -4179,8 +4311,9 @@
  #ifdef __APPLE__
    return os::thread_cpu_time(Thread::current(), user_sys_cpu_time);
  #else
@@ -6288,7 +6295,7 @@ 
  #endif
  }
  
-@@ -4215,8 +4349,41 @@
+@@ -4205,8 +4338,41 @@
      return ((jlong)tinfo.user_time.seconds * 1000000000) + ((jlong)tinfo.user_time.microseconds * (jlong)1000);
    }
  #else
@@ -6332,7 +6339,7 @@ 
  #endif
  }
  
-@@ -4239,7 +4406,7 @@
+@@ -4229,7 +4395,7 @@
  #ifdef __APPLE__
    return true;
  #else
@@ -6341,7 +6348,7 @@ 
  #endif
  }
  
-@@ -4337,21 +4504,36 @@
+@@ -4327,21 +4493,36 @@
  
  static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) {
    if (millis < 0)  millis = 0;
@@ -6387,7 +6394,7 @@ 
    return abstime;
  }
  
-@@ -4443,7 +4625,7 @@
+@@ -4433,7 +4614,7 @@
      status = os::Bsd::safe_cond_timedwait(_cond, _mutex, &abst);
      if (status != 0 && WorkAroundNPTLTimedWaitHang) {
        pthread_cond_destroy (_cond);
@@ -6396,7 +6403,7 @@ 
      }
      assert_status(status == 0 || status == EINTR ||
                    status == ETIMEDOUT,
-@@ -4544,32 +4726,50 @@
+@@ -4534,32 +4715,50 @@
  
  static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) {
    assert (time > 0, "convertTime");
@@ -6467,7 +6474,7 @@ 
        if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
          absTime->tv_nsec -= NANOSECS_PER_SEC;
          ++absTime->tv_sec; // note: this must be <= max_secs
-@@ -4649,15 +4849,19 @@
+@@ -4639,15 +4838,19 @@
    jt->set_suspend_equivalent();
    // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
  
@@ -6491,7 +6498,7 @@ 
    assert_status(status == 0 || status == EINTR ||
                  status == ETIMEDOUT,
                  status, "cond_timedwait");
-@@ -4686,17 +4890,26 @@
+@@ -4676,17 +4879,26 @@
    s = _counter;
    _counter = 1;
    if (s < 1) {
@@ -6527,7 +6534,7 @@ 
    } else {
      pthread_mutex_unlock(_mutex);
      assert (status == 0, "invariant") ;
-@@ -4827,13 +5040,29 @@
+@@ -4817,13 +5029,29 @@
  
  // Get the default path to the core file
  // Returns the length of the string
@@ -6564,8 +6571,8 @@ 
  }
  
  #ifndef PRODUCT
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -58,12 +58,16 @@
    // For signal flags diagnostics
    static int sigflags[MAXSIGNUM];
@@ -6583,8 +6590,8 @@ 
  #endif
  
    static GrowableArray<int>* _cpu_to_node;
-@@ -94,6 +98,9 @@
- 
+@@ -95,6 +99,9 @@
+   static bool is_initial_thread(void);
    static pid_t gettid();
  
 +  static address   initial_thread_stack_bottom(void)                { return _initial_thread_stack_bottom; }
@@ -6593,7 +6600,7 @@ 
    static int page_size(void)                                        { return _page_size; }
    static void set_page_size(int val)                                { _page_size = val; }
  
-@@ -147,6 +154,13 @@
+@@ -148,6 +155,13 @@
  #endif
    }
  
@@ -6607,7 +6614,7 @@ 
    // Stack repair handling
  
    // none present
-@@ -212,7 +226,7 @@
+@@ -213,7 +227,7 @@
    public:
      PlatformEvent() {
        int status;
@@ -6616,7 +6623,7 @@ 
        assert_status(status == 0, status, "cond_init");
        status = pthread_mutex_init (_mutex, NULL);
        assert_status(status == 0, status, "mutex_init");
-@@ -227,14 +241,19 @@
+@@ -228,14 +242,19 @@
      void park () ;
      void unpark () ;
      int  TryPark () ;
@@ -6638,7 +6645,7 @@ 
  
    public:       // TODO-FIXME: make dtor private
      ~PlatformParker() { guarantee (0, "invariant") ; }
-@@ -242,10 +261,13 @@
+@@ -243,10 +262,13 @@
    public:
      PlatformParker() {
        int status;
@@ -6654,8 +6661,8 @@ 
      }
  };
  
---- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -33,30 +33,50 @@
  #include <sys/syscall.h>
  #include <unistd.h>
@@ -6717,9 +6724,9 @@ 
        os::fork_and_exec(buf);
        yes = false;
      }
---- ./hotspot/src/os/linux/vm/os_linux.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os/linux/vm/os_linux.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -6435,6 +6435,10 @@
+--- ./hotspot/src/os/linux/vm/os_linux.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os/linux/vm/os_linux.cpp	Mon Sep 03 11:13:04 2018 -0700
+@@ -6285,6 +6285,10 @@
      return 0;
    }
  
@@ -6730,8 +6737,8 @@ 
    return strlen(buffer);
  }
  
---- ./hotspot/src/os/posix/vm/os_posix.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os/posix/vm/os_posix.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/os/posix/vm/os_posix.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os/posix/vm/os_posix.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -53,12 +53,11 @@
    n = get_core_path(buffer, bufferSize);
  
@@ -6794,9 +6801,9 @@ 
      // Linux specific
  #ifdef SI_TKILL
      { SI_TKILL,     "SI_TKILL",    "Signal sent by tkill (pthread_kill)" },
---- ./hotspot/src/os/solaris/vm/os_solaris.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os/solaris/vm/os_solaris.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -6386,6 +6386,10 @@
+--- ./hotspot/src/os/solaris/vm/os_solaris.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os/solaris/vm/os_solaris.cpp	Mon Sep 03 11:13:04 2018 -0700
+@@ -6375,6 +6375,10 @@
      return 0;
    }
  
@@ -6808,7 +6815,7 @@ 
  }
  
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,400 @@
 +/*
 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7211,7 +7218,7 @@ 
 +
 +#endif // OS_CPU_BSD_PPC_VM_ATOMIC_BSD_PPC_INLINE_HPP
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7253,7 +7260,7 @@ 
 +
 +#endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,54 @@
 +/*
 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7310,7 +7317,7 @@ 
 +
 +#endif // OS_CPU_BSD_PPC_VM_GLOBALS_BSD_PPC_HPP
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,149 @@
 +/*
 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7462,7 +7469,7 @@ 
 +
 +#endif // OS_CPU_BSD_PPC_VM_ORDERACCESS_BSD_PPC_INLINE_HPP
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,666 @@
 +/*
 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8131,7 +8138,7 @@ 
 +}
 +#endif
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,35 @@
 +/*
 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8169,7 +8176,7 @@ 
 +
 +#endif // OS_CPU_BSD_PPC_VM_OS_BSD_PPC_HPP
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8222,7 +8229,7 @@ 
 +
 +#endif // OS_CPU_BSD_PPC_VM_PREFETCH_BSD_PPC_INLINE_HPP
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8264,7 +8271,7 @@ 
 +  os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,36 @@
 +/*
 + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8303,7 +8310,7 @@ 
 +
 +#endif // OS_CPU_BSD_PPC_VM_THREADLS_BSD_PPC_HPP
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,36 @@
 +/*
 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8342,7 +8349,7 @@ 
 +
 +void JavaThread::cache_global_variables() { }
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,83 @@
 +/*
 + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8428,7 +8435,7 @@ 
 +
 +#endif // OS_CPU_BSD_PPC_VM_THREAD_BSD_PPC_HPP
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp	Sat Dec 01 12:42:05 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -0,0 +1,55 @@
 +/*
 + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8485,31 +8492,8 @@ 
 +#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 +
 +#endif // OS_CPU_BSD_PPC_VM_VMSTRUCTS_BSD_PPC_HPP
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -281,11 +281,11 @@
- address os::current_stack_pointer() {
- #if defined(__clang__) || defined(__llvm__)
-   register void *esp;
--  __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
-+  __asm__("mov %%" SPELL_REG_SP ", %0" : "=r" (esp));
-   return (address) esp;
- #elif defined(SPARC_WORKS)
-   register void *esp;
--  __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
-+  __asm__("mov %%" SPELL_REG_SP ", %0" : "=r" (esp));
-   return (address) ((char*)esp + sizeof(long)*2);
- #else
-   register void *esp __asm__ (SPELL_REG_SP);
-@@ -368,7 +368,7 @@
- intptr_t* _get_previous_fp() {
- #if defined(SPARC_WORKS) || defined(__clang__) || defined(__llvm__)
-   register intptr_t **ebp;
--  __asm__("mov %%"SPELL_REG_FP", %0":"=r"(ebp));
-+  __asm__("mov %%" SPELL_REG_FP ", %0" : "=r" (ebp));
- #else
-   register intptr_t **ebp __asm__ (SPELL_REG_FP);
- #endif
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -594,7 +594,11 @@
            stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
        }
@@ -8522,107 +8506,8 @@ 
                 thread->doing_unsafe_access()) {
          stub = StubRoutines::handler_for_unsafe_access();
      }
---- ./hotspot/src/share/vm/code/compiledIC.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/code/compiledIC.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -222,7 +222,7 @@
-     assert(bytecode == Bytecodes::_invokeinterface, "");
-     int itable_index = call_info->itable_index();
-     entry = VtableStubs::find_itable_stub(itable_index);
--    if (entry == false) {
-+    if (entry == NULL) {
-       return false;
-     }
- #ifdef ASSERT
---- ./hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -49,10 +49,11 @@
- 
- #define check_index(index, msg)                                                \
-   assert((index) < (_reserved.word_size() >> LogN_words),                      \
--         err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \
-+         err_msg("%s - index: " SIZE_FORMAT                                    \
-+		 ", _vs.committed_size: " SIZE_FORMAT,                         \
-                  msg, (index), (_reserved.word_size() >> LogN_words)));        \
-   assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)),   \
--         err_msg("Index "SIZE_FORMAT" corresponding to "PTR_FORMAT             \
-+         err_msg("Index " SIZE_FORMAT " corresponding to " PTR_FORMAT          \
-                  " (%u) is not in committed area.",                            \
-                  (index),                                                      \
-                  p2i(address_for_index_raw(index)),                            \
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -668,7 +668,7 @@
-   jlong ret_val = now - _time_of_last_gc;
-   // XXX See note in genCollectedHeap::millis_since_last_gc().
-   if (ret_val < 0) {
--    NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
-+    NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
-     return 0;
-   }
-   return ret_val;
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -3291,7 +3291,7 @@
-   jlong ret_val = now - _time_of_last_gc;
-   // XXX See note in genCollectedHeap::millis_since_last_gc().
-   if (ret_val < 0) {
--    NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
-+    NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
-     return 0;
-   }
-   return ret_val;
---- ./hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -98,10 +98,10 @@
-   if (_allocated == 0) {
-     assert(_unused == 0,
-            err_msg("Inconsistency in PLAB stats: "
--                   "_allocated: "SIZE_FORMAT", "
--                   "_wasted: "SIZE_FORMAT", "
--                   "_unused: "SIZE_FORMAT", "
--                   "_used  : "SIZE_FORMAT,
-+                   "_allocated: " SIZE_FORMAT ", "
-+                   "_wasted: " SIZE_FORMAT ", "
-+                   "_unused: " SIZE_FORMAT ", "
-+                   "_used  : " SIZE_FORMAT,
-                    _allocated, _wasted, _unused, _used));
- 
-     _allocated = 1;
---- ./hotspot/src/share/vm/memory/genCollectedHeap.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/memory/genCollectedHeap.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -1403,7 +1403,7 @@
-   // back a time later than 'now'.
-   jlong retVal = now - tolgc_cl.time();
-   if (retVal < 0) {
--    NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);)
-+    NOT_PRODUCT(warning("time warp: " INT64_FORMAT, (int64_t) retVal);)
-     return 0;
-   }
-   return retVal;
---- ./hotspot/src/share/vm/memory/generation.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/memory/generation.hpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -422,7 +422,7 @@
-     // have to guard against non-monotonicity.
-     NOT_PRODUCT(
-       if (now < _time_of_last_gc) {
--        warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
-+        warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
-       }
-     )
-     return _time_of_last_gc;
---- ./hotspot/src/share/vm/memory/referenceProcessor.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/memory/referenceProcessor.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -161,7 +161,7 @@
- 
-   NOT_PRODUCT(
-   if (now < _soft_ref_timestamp_clock) {
--    warning("time warp: "INT64_FORMAT" to "INT64_FORMAT,
-+    warning("time warp: " INT64_FORMAT " to " INT64_FORMAT,
-             _soft_ref_timestamp_clock, now);
-   }
-   )
---- ./hotspot/src/share/vm/opto/lcm.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/opto/lcm.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/opto/lcm.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/opto/lcm.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -49,7 +49,7 @@
  // Check whether val is not-null-decoded compressed oop,
  // i.e. will grab into the base of the heap if it represents NULL.
@@ -8632,8 +8517,8 @@ 
      if (val && val->is_Mach()) {
        if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
          // This assumes all Decodes with TypePtr::NotNull are matched to nodes that
---- ./hotspot/src/share/vm/opto/loopPredicate.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/opto/loopPredicate.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/opto/loopPredicate.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/opto/loopPredicate.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -869,7 +869,7 @@
        Node*          idx    = cmp->in(1);
        assert(!invar.is_invariant(idx), "index is variant");
@@ -8643,8 +8528,8 @@ 
        assert(invar.is_invariant(rng), "range must be invariant");
        int scale    = 1;
        Node* offset = zero;
---- ./hotspot/src/share/vm/opto/node.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/opto/node.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/opto/node.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/opto/node.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -286,6 +286,10 @@
  #ifdef _MSC_VER // the IDX_INIT hack falls foul of warning C4355
  #pragma warning( disable:4355 ) // 'this' : used in base member initializer list
@@ -8667,32 +8552,18 @@ 
  
  //------------------------------clone------------------------------------------
  // Clone a Node.
---- ./hotspot/src/share/vm/prims/unsafe.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/prims/unsafe.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -985,7 +985,7 @@
- UNSAFE_END
- 
- 
--#define DAC_Args CLS"[B["OBJ
-+#define DAC_Args CLS "[B[" OBJ
- // define a class but do not make it known to the class loader or system dictionary
- // - host_class:  supplies context for linkage, access control, protection domain, and class loader
- // - data:  bytes of a class file, a raw memory address (length gives the number of bytes)
---- ./hotspot/src/share/vm/prims/whitebox.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/prims/whitebox.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -158,8 +158,10 @@
+--- ./hotspot/src/share/vm/prims/whitebox.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/prims/whitebox.cpp	Mon Sep 03 11:13:04 2018 -0700
+@@ -158,7 +158,7 @@
  }
  WB_END
  
 -#ifdef LINUX
 +#if defined(LINUX) || defined(_ALLBSD_SOURCE)
  #include "utilities/elfFile.hpp"
-+#endif
-+#if defined(LINUX)
- #include "osContainer_linux.hpp"
  #endif
  
-@@ -1017,7 +1019,7 @@
+@@ -1016,7 +1016,7 @@
  // Checks that the library libfile has the noexecstack bit set.
  WB_ENTRY(jboolean, WB_CheckLibSpecifiesNoexecstack(JNIEnv* env, jobject o, jstring libfile))
    jboolean ret = false;
@@ -8701,8 +8572,8 @@ 
    // Can't be in VM when we call JNI.
    ThreadToNativeFromVM ttnfv(thread);
    const char* lf = env->GetStringUTFChars(libfile, NULL);
---- ./hotspot/src/share/vm/runtime/atomic.inline.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/runtime/atomic.inline.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -63,6 +63,9 @@
  #endif
  
@@ -8713,8 +8584,8 @@ 
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "atomic_bsd_x86.inline.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/globals.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/runtime/globals.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/runtime/globals.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/runtime/globals.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -94,6 +94,9 @@
  #ifdef TARGET_OS_ARCH_aix_ppc
  # include "globals_aix_ppc.hpp"
@@ -8725,8 +8596,8 @@ 
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "globals_bsd_x86.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -64,6 +64,9 @@
  #endif
  
@@ -8737,9 +8608,9 @@ 
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "orderAccess_bsd_x86.inline.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/os.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/runtime/os.cpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -434,15 +434,6 @@
+--- ./hotspot/src/share/vm/runtime/os.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/runtime/os.cpp	Mon Sep 03 11:13:04 2018 -0700
+@@ -426,15 +426,6 @@
      if (_native_java_library == NULL) {
        vm_exit_during_initialization("Unable to load native library", ebuf);
      }
@@ -8755,9 +8626,9 @@ 
    }
    static jboolean onLoaded = JNI_FALSE;
    if (onLoaded) {
---- ./hotspot/src/share/vm/runtime/os.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/runtime/os.hpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -868,6 +868,9 @@
+--- ./hotspot/src/share/vm/runtime/os.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/runtime/os.hpp	Mon Sep 03 11:13:04 2018 -0700
+@@ -843,6 +843,9 @@
  #ifdef TARGET_OS_ARCH_aix_ppc
  # include "os_aix_ppc.hpp"
  #endif
@@ -8767,8 +8638,8 @@ 
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "os_bsd_x86.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -63,6 +63,9 @@
  #endif
  
@@ -8779,8 +8650,8 @@ 
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "prefetch_bsd_x86.inline.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/thread.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/runtime/thread.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/runtime/thread.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/runtime/thread.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -1730,6 +1730,9 @@
  #ifdef TARGET_OS_ARCH_aix_ppc
  # include "thread_aix_ppc.hpp"
@@ -8791,8 +8662,8 @@ 
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "thread_bsd_x86.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -75,6 +75,9 @@
  #ifdef TARGET_OS_ARCH_aix_ppc
  # include "threadLS_aix_ppc.hpp"
@@ -8803,8 +8674,8 @@ 
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "threadLS_bsd_x86.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/virtualspace.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/runtime/virtualspace.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/runtime/virtualspace.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/runtime/virtualspace.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -342,7 +342,7 @@
                  (UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
                   Universe::narrow_oop_use_implicit_null_checks()) ?
@@ -8814,8 +8685,8 @@ 
      MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
    }
  
---- ./hotspot/src/share/vm/runtime/vmStructs.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/runtime/vmStructs.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/runtime/vmStructs.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/runtime/vmStructs.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -146,6 +146,9 @@
  #ifdef TARGET_OS_ARCH_aix_ppc
  # include "vmStructs_aix_ppc.hpp"
@@ -8835,8 +8706,8 @@ 
                                                                            \
    NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset)))      \
    declare_constant(frame::pc_return_offset)                               \
---- ./hotspot/src/share/vm/services/mallocSiteTable.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/services/mallocSiteTable.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/services/mallocSiteTable.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/services/mallocSiteTable.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -42,7 +42,7 @@
  
   public:
@@ -8846,8 +8717,8 @@ 
  
    MallocSite(const NativeCallStack& stack, MEMFLAGS flags) :
      AllocationSite<MemoryCounter>(stack), _flags(flags) {}
---- ./hotspot/src/share/vm/services/memTracker.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/services/memTracker.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/services/memTracker.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/services/memTracker.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -67,10 +67,6 @@
      os::unsetenv(buf);
    }
@@ -8859,8 +8730,8 @@ 
    if (!MallocTracker::initialize(level) ||
        !VirtualMemoryTracker::initialize(level)) {
      level = NMT_off;
---- ./hotspot/src/share/vm/services/memTracker.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/services/memTracker.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/services/memTracker.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/services/memTracker.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -31,8 +31,8 @@
  
  #if !INCLUDE_NMT
@@ -8884,8 +8755,8 @@ 
  
  class MemBaseline;
  class Mutex;
---- ./hotspot/src/share/vm/services/virtualMemoryTracker.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/services/virtualMemoryTracker.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/services/virtualMemoryTracker.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/services/virtualMemoryTracker.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -167,7 +167,7 @@
            // higher part
            address high_base = addr + sz;
@@ -8895,8 +8766,8 @@ 
            return add_committed_region(high_rgn);
          } else {
            return false;
---- ./hotspot/src/share/vm/services/virtualMemoryTracker.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/services/virtualMemoryTracker.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/services/virtualMemoryTracker.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/services/virtualMemoryTracker.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -305,7 +305,7 @@
  
  
@@ -8906,8 +8777,8 @@ 
      _all_committed(false) { }
  
    // Copy constructor
---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -30,6 +30,11 @@
  // This file holds compiler-dependent includes,
  // globally used constants & types, class (forward)
@@ -8939,8 +8810,8 @@ 
  #define CAN_USE_NAN_DEFINE 1
  #endif
  
---- ./hotspot/src/share/vm/utilities/nativeCallStack.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/utilities/nativeCallStack.cpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/utilities/nativeCallStack.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/utilities/nativeCallStack.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -27,7 +27,10 @@
  #include "utilities/globalDefinitions.hpp"
  #include "utilities/nativeCallStack.hpp"
@@ -8953,8 +8824,8 @@ 
  
  NativeCallStack::NativeCallStack(int toSkip, bool fillStack) :
    _hash_value(0) {
---- ./hotspot/src/share/vm/utilities/nativeCallStack.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/utilities/nativeCallStack.hpp	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/src/share/vm/utilities/nativeCallStack.hpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/utilities/nativeCallStack.hpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -53,7 +53,7 @@
   */
  class NativeCallStack : public StackObj {
@@ -8963,9 +8834,9 @@ 
 +  static const NativeCallStack& EMPTY_STACK();
  
   private:
-   address       _stack[NMT_TrackingStackDepth];
---- ./hotspot/src/share/vm/utilities/vmError.cpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/utilities/vmError.cpp	Sat Dec 01 12:42:05 2018 -0800
+   address   _stack[NMT_TrackingStackDepth];
+--- ./hotspot/src/share/vm/utilities/vmError.cpp	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/src/share/vm/utilities/vmError.cpp	Mon Sep 03 11:13:04 2018 -0700
 @@ -22,7 +22,6 @@
   *
   */
@@ -8974,19 +8845,8 @@ 
  #include "precompiled.hpp"
  #include "compiler/compileBroker.hpp"
  #include "gc_interface/collectedHeap.hpp"
---- ./hotspot/src/share/vm/utilities/vmError.hpp	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/src/share/vm/utilities/vmError.hpp	Sat Dec 01 12:42:05 2018 -0800
-@@ -34,7 +34,7 @@
-   friend class VM_ReportJavaOutOfMemory;
-   friend class Decoder;
- 
--  int          _id;          // Solaris/Linux signals: 0 - SIGRTMAX
-+  unsigned int _id;          // Solaris/Linux signals: 0 - SIGRTMAX
-                              // Windows exceptions: 0xCxxxxxxx system errors
-                              //                     0x8xxxxxxx system warnings
- 
---- ./jdk/make/CompileDemos.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/CompileDemos.gmk	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/CompileDemos.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/CompileDemos.gmk	Sun Sep 02 07:33:40 2018 -0700
 @@ -323,7 +323,7 @@
  $(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \
      -I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
@@ -8996,8 +8856,8 @@ 
  
  $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
  $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
---- ./jdk/make/CompileJavaClasses.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/CompileJavaClasses.gmk	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/CompileJavaClasses.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/CompileJavaClasses.gmk	Sun Sep 02 07:33:40 2018 -0700
 @@ -128,23 +128,32 @@
        sun/nio/fs/LinuxFileStore.java \
        sun/nio/fs/LinuxFileSystem.java \
@@ -9099,8 +8959,8 @@ 
          $(CLOSED_SRC_DIRS), \
      INCLUDES := $(SECURITY_PKGS), \
      EXCLUDES := $(EXCLUDES), \
---- ./jdk/make/CompileLaunchers.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/CompileLaunchers.gmk	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/CompileLaunchers.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/CompileLaunchers.gmk	Sun Sep 02 07:33:40 2018 -0700
 @@ -49,7 +49,7 @@
    ORIGIN_ROOT := /..
  endif
@@ -9205,8 +9065,8 @@ 
    BUILD_JSPAWNHELPER := 1
  endif
  
---- ./jdk/make/CopyFiles.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/CopyFiles.gmk	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/CopyFiles.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/CopyFiles.gmk	Sun Sep 02 07:33:40 2018 -0700
 @@ -29,6 +29,8 @@
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -9216,7 +9076,7 @@ 
  else ifeq ($(OPENJDK_TARGET_OS), macosx)
    OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin
  endif
-@@ -335,23 +337,23 @@
+@@ -323,23 +325,23 @@
  	$(RM) $(@)
          # Now check for other permutations
          ifeq ($(JVM_VARIANT_SERVER), true)
@@ -9249,8 +9109,8 @@ 
              endif
            endif
          endif
---- ./jdk/make/Images.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/Images.gmk	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/Images.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/Images.gmk	Sun Sep 02 07:33:40 2018 -0700
 @@ -236,11 +236,11 @@
  endif
  
@@ -9321,7 +9181,7 @@ 
  
  ################################################################################
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/data/classlist/classlist.bsd	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/make/data/classlist/classlist.bsd	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,2559 @@
 +java/lang/Object
 +java/lang/String
@@ -11882,8 +11742,8 @@ 
 +java/awt/MenuBar
 +sun/awt/X11/XErrorEvent
 +# eea35d9d56e0006e
---- ./jdk/make/gendata/GendataFontConfig.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/gendata/GendataFontConfig.gmk	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/gendata/GendataFontConfig.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/gendata/GendataFontConfig.gmk	Sun Sep 02 07:33:40 2018 -0700
 @@ -73,6 +73,13 @@
    GENDATA_FONT_CONFIG_SRC_PREFIX := aix.
  endif
@@ -11898,9 +11758,9 @@ 
  ###
  
  $(GENDATA_FONT_CONFIG_DST)/%.src: \
---- ./jdk/make/lib/Awt2dLibraries.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/lib/Awt2dLibraries.gmk	Sat Dec 01 12:24:15 2018 -0800
-@@ -306,7 +306,7 @@
+--- ./jdk/make/lib/Awt2dLibraries.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/lib/Awt2dLibraries.gmk	Sun Sep 02 07:33:40 2018 -0700
+@@ -309,7 +309,7 @@
      debug_trace.c \
      debug_util.c
  
@@ -11909,7 +11769,7 @@ 
    LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c
  endif
  
-@@ -477,6 +477,7 @@
+@@ -481,6 +481,7 @@
      LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \
      LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \
      LDFLAGS_SUFFIX_aix :=-ljvm $(LIBM) $(LIBDL) -ljava -lm,\
@@ -11917,7 +11777,7 @@ 
      LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \
          -framework Cocoa \
          -framework OpenGL \
-@@ -553,6 +554,16 @@
+@@ -557,6 +558,16 @@
        endif
      endif
  
@@ -11934,7 +11794,7 @@ 
      ifeq ($(MILESTONE), internal)
        LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD
      endif
-@@ -621,6 +632,11 @@
+@@ -625,6 +636,11 @@
        LIBAWT_XAWT_LDFLAGS += -lpthread
      endif
  
@@ -11946,15 +11806,15 @@ 
      $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \
          LIBRARY := awt_xawt, \
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-@@ -635,6 +651,7 @@
-             $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS) \
+@@ -646,6 +662,7 @@
+             -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
              $(call SET_SHARED_LIBRARY_ORIGIN) \
              $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
 +        LDFLAGS_bsd := $(call SET_SHARED_LIBRARY_ORIGIN), \
          LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \
          VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
          RC_FLAGS := $(RC_FLAGS) \
-@@ -678,6 +695,7 @@
+@@ -689,6 +706,7 @@
      LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
      LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
      LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\
@@ -11962,7 +11822,7 @@ 
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=lcms.dll" \
-@@ -834,6 +852,7 @@
+@@ -847,6 +865,7 @@
          LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \
          LDFLAGS_SUFFIX_aix := -ljvm -lawt -ljava,\
          LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \
@@ -11970,7 +11830,7 @@ 
          OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \
          DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
-@@ -916,6 +935,7 @@
+@@ -924,6 +943,7 @@
      LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
      LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
      LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\
@@ -11978,7 +11838,7 @@ 
      LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
          -ljava -ljvm, \
      LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
-@@ -1059,6 +1079,7 @@
+@@ -1067,6 +1087,7 @@
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB), \
        CFLAGS_linux := $(HEADLESS_CFLAG), \
@@ -11986,7 +11846,7 @@ 
        CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \
        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
-@@ -1067,6 +1088,7 @@
+@@ -1075,6 +1096,7 @@
        LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \
        LDFLAGS_SUFFIX_aix := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\
        LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \
@@ -11994,7 +11854,7 @@ 
        LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \
            -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
-@@ -1185,7 +1207,7 @@
+@@ -1193,7 +1215,7 @@
      $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
  
    ifeq ($(USE_EXTERNAL_LIBGIF), true)
@@ -12003,17 +11863,29 @@ 
    else
      LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
      GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
-@@ -1235,7 +1257,7 @@
-         -framework JavaNativeFoundation
-   else ifeq ($(OPENJDK_TARGET_OS), windows)
-     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
--  else
-+  else	# .. all other Unixes can use X_LIBS
+@@ -1226,6 +1248,11 @@
+     LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
+   else ifeq ($(OPENJDK_TARGET_OS), solaris)
+     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
++  else ifeq ($(OPENJDK_TARGET_OS), bsd)
++    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include
++    ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
++      LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG
++    endif
+   else
+     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
+   endif
+@@ -1248,6 +1275,8 @@
+   else ifeq ($(OPENJDK_TARGET_OS), solaris)
+     # Solaris still uses OPENWIN_LIB ..
+     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
++  else ifeq ($(OPENJDK_TARGET_OS), bsd)
++    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread
+   else	# .. all other Unixes can use X_LIBS
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
    endif
- 
---- ./jdk/make/lib/CoreLibraries.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/lib/CoreLibraries.gmk	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/lib/CoreLibraries.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/lib/CoreLibraries.gmk	Sun Sep 02 07:33:40 2018 -0700
 @@ -100,7 +100,7 @@
  endif
  
@@ -12039,7 +11911,7 @@ 
      LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
      RC_FLAGS := $(RC_FLAGS) \
-@@ -407,7 +409,7 @@
+@@ -402,7 +404,7 @@
  # Append defines depending on target platform
  LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS)
  
@@ -12048,7 +11920,7 @@ 
    LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
  endif
  
-@@ -442,11 +444,13 @@
+@@ -437,11 +439,13 @@
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
      LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
@@ -12062,7 +11934,7 @@ 
      LDFLAGS_SUFFIX_windows := \
          -export:JLI_Launch \
          -export:JLI_ManifestIterate \
-@@ -490,9 +494,9 @@
+@@ -485,9 +489,9 @@
  
    BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
  
@@ -12074,7 +11946,7 @@ 
    # code it here...rather than add support to NativeCompilation
    # as this is first time I see it
    $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
-@@ -531,6 +535,13 @@
+@@ -526,6 +530,13 @@
  
  ##########################################################################################
  
@@ -12088,7 +11960,7 @@ 
  $(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \
      LIBRARY := npt, \
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-@@ -540,9 +551,11 @@
+@@ -535,9 +546,11 @@
      CFLAGS := $(CFLAGS_JDKLIB) \
          -I$(JDK_TOPDIR)/src/share/npt \
          -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
@@ -12100,8 +11972,8 @@ 
      LDFLAGS_macosx := -liconv, \
      LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
      LDFLAGS_SUFFIX_solaris := -lc, \
---- ./jdk/make/lib/NetworkingLibraries.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/lib/NetworkingLibraries.gmk	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/lib/NetworkingLibraries.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/lib/NetworkingLibraries.gmk	Sun Sep 02 07:33:40 2018 -0700
 @@ -42,7 +42,7 @@
    LIBNET_EXCLUDE_FILES += linux_close.c
  endif
@@ -12130,8 +12002,8 @@ 
      LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \
          delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \
          -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \
---- ./jdk/make/lib/NioLibraries.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/lib/NioLibraries.gmk	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/lib/NioLibraries.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/lib/NioLibraries.gmk	Sun Sep 02 07:33:40 2018 -0700
 @@ -77,9 +77,28 @@
        UnixNativeDispatcher.c
  endif
@@ -12192,8 +12064,8 @@ 
    endif
 +  endif
  endif
---- ./jdk/make/lib/ServiceabilityLibraries.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/lib/ServiceabilityLibraries.gmk	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/lib/ServiceabilityLibraries.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/lib/ServiceabilityLibraries.gmk	Sun Sep 02 07:33:40 2018 -0700
 @@ -34,7 +34,7 @@
  ifneq ($(OPENJDK_TARGET_OS), linux)
    LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c
@@ -12277,8 +12149,8 @@ 
    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
      LIBHPROF_OPTIMIZATION := LOW
    endif
---- ./jdk/make/lib/SoundLibraries.gmk	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/lib/SoundLibraries.gmk	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/lib/SoundLibraries.gmk	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/lib/SoundLibraries.gmk	Sun Sep 02 07:33:40 2018 -0700
 @@ -75,6 +75,13 @@
    LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX
  endif # OPENJDK_TARGET_OS aix
@@ -12310,8 +12182,8 @@ 
        LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
---- ./jdk/make/mapfiles/launchers/mapfile-ppc64	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/mapfiles/launchers/mapfile-ppc64	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/mapfiles/launchers/mapfile-ppc64	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/mapfiles/launchers/mapfile-ppc64	Sun Sep 02 07:33:40 2018 -0700
 @@ -33,6 +33,7 @@
  		environ;	# Public symbols and required by Java run time
  		_environ;
@@ -12320,8 +12192,8 @@ 
  
  	local:
  		*;
---- ./jdk/make/mapfiles/launchers/mapfile-x86	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/mapfiles/launchers/mapfile-x86	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/mapfiles/launchers/mapfile-x86	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/mapfiles/launchers/mapfile-x86	Sun Sep 02 07:33:40 2018 -0700
 @@ -33,6 +33,7 @@
  		environ;	# Public symbols and required by Java run time
  		_environ;
@@ -12330,8 +12202,8 @@ 
  		___Argv;	# The following are private, but as they are
  		_start;		# exported from ctr1/crtn, the clever hacker
  		_init;		# might know about them.  However note, that
---- ./jdk/make/mapfiles/launchers/mapfile-x86_64	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/mapfiles/launchers/mapfile-x86_64	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/mapfiles/launchers/mapfile-x86_64	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/mapfiles/launchers/mapfile-x86_64	Sun Sep 02 07:33:40 2018 -0700
 @@ -33,6 +33,7 @@
  		environ;	# Public symbols and required by Java run time
  		_environ;
@@ -12341,7 +12213,7 @@ 
  	local:
  		*;
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/mapfiles/libattach/mapfile-bsd	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/make/mapfiles/libattach/mapfile-bsd	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,42 @@
 +#
 +# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
@@ -12386,7 +12258,7 @@ 
 +		*;
 +};
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/mapfiles/libnio/mapfile-bsd	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/make/mapfiles/libnio/mapfile-bsd	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,195 @@
 +#
 +# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -12583,8 +12455,8 @@ 
 +	local:
 +		*;
 +};
---- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200	Sun Sep 02 07:33:40 2018 -0700
 @@ -26,6 +26,9 @@
  # Define library interface.
  
@@ -12596,7 +12468,7 @@ 
  	    *;
  };
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/netbeans/common/bsd-sources.ent	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/make/netbeans/common/bsd-sources.ent	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,45 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +
@@ -12644,7 +12516,7 @@ 
 +    <location>${root}/src/bsd/classes</location>
 +</source-folder>
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/netbeans/common/bsd-view.ent	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/make/netbeans/common/bsd-view.ent	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,39 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +
@@ -12685,8 +12557,8 @@ 
 +    <includes>${includes}</includes>
 +    <excludes>${excludes}</excludes>
 +</source-folder>
---- ./jdk/make/netbeans/common/java-data-native.ent	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/netbeans/common/java-data-native.ent	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/netbeans/common/java-data-native.ent	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/netbeans/common/java-data-native.ent	Sun Sep 02 07:33:40 2018 -0700
 @@ -34,6 +34,7 @@
  <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
      <compilation-unit>
@@ -12695,8 +12567,8 @@ 
          <package-root>${root}/src/macosx/classes</package-root>
          <package-root>${root}/src/solaris/classes</package-root>
          <package-root>${root}/src/windows/classes</package-root>
---- ./jdk/make/netbeans/common/make.xml	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/netbeans/common/make.xml	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/netbeans/common/make.xml	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/netbeans/common/make.xml	Sun Sep 02 07:33:40 2018 -0700
 @@ -32,16 +32,21 @@
  -->
  
@@ -12731,8 +12603,8 @@ 
      <macrodef name="make-run">
              <attribute name="target"/>
              <attribute name="dir"/>
---- ./jdk/make/netbeans/j2se/nbproject/project.xml	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/netbeans/j2se/nbproject/project.xml	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/netbeans/j2se/nbproject/project.xml	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/netbeans/j2se/nbproject/project.xml	Sun Sep 02 07:33:40 2018 -0700
 @@ -34,6 +34,7 @@
  <!DOCTYPE project [
      <!ENTITY properties SYSTEM "../../common/properties.ent">
@@ -12765,8 +12637,8 @@ 
                      &macosx-view;
                      &unix-view;
                      &windows-view;
---- ./jdk/make/netbeans/world/nbproject/project.xml	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/make/netbeans/world/nbproject/project.xml	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/make/netbeans/world/nbproject/project.xml	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/make/netbeans/world/nbproject/project.xml	Sun Sep 02 07:33:40 2018 -0700
 @@ -34,12 +34,14 @@
  <!DOCTYPE project [
      <!ENTITY properties SYSTEM "../../common/properties.ent">
@@ -12799,7 +12671,7 @@ 
                      &unix-view;
                      &windows-view;
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,97 @@
 +/*
 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -12899,7 +12771,7 @@ 
 +    }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,48 @@
 +/*
 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -12950,7 +12822,7 @@ 
 +
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,213 @@
 +/*
 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -13166,7 +13038,7 @@ 
 +    private static native void interrupt(int fd);
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,263 @@
 +/*
 + * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -13432,7 +13304,7 @@ 
 +    }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,44 @@
 +/*
 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -13478,8 +13350,8 @@ 
 +        return new KQueueSelectorImpl(this);
 +    }
 +}
---- ./jdk/src/bsd/doc/man/javah.1	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/bsd/doc/man/javah.1	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/bsd/doc/man/javah.1	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/bsd/doc/man/javah.1	Sun Sep 02 07:33:40 2018 -0700
 @@ -8,7 +8,7 @@
  .\"
  .\" This code is distributed in the hope that it will be useful, but WITHOUT
@@ -13498,8 +13370,8 @@ 
  
  \fIWindows\fR:
  
---- ./jdk/src/bsd/doc/man/rmic.1	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/bsd/doc/man/rmic.1	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/bsd/doc/man/rmic.1	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/bsd/doc/man/rmic.1	Sun Sep 02 07:33:40 2018 -0700
 @@ -8,7 +8,7 @@
  .\"
  .\" This code is distributed in the hope that it will be useful, but WITHOUT
@@ -13527,8 +13399,8 @@ 
  .SH SEE\ ALSO    
  .TP 0.2i    
  \(bu
---- ./jdk/src/bsd/doc/man/rmid.1	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/bsd/doc/man/rmid.1	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/bsd/doc/man/rmid.1	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/bsd/doc/man/rmid.1	Sun Sep 02 07:33:40 2018 -0700
 @@ -8,7 +8,7 @@
  .\"
  .\" This code is distributed in the hope that it will be useful, but WITHOUT
@@ -13548,7 +13420,7 @@ 
  .TP 0.2i    
  \(bu
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,171 @@
 +/*
 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -13721,7 +13593,7 @@ 
 +    }
 +}
 +
---- ./jdk/src/macosx/classes/java/net/DefaultInterface.java	Sat Oct 06 10:26:40 2018 +0100
+--- ./jdk/src/macosx/classes/java/net/DefaultInterface.java	Sat Jun 23 21:02:10 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,97 +0,0 @@
 -/*
@@ -13821,7 +13693,7 @@ 
 -        return (ppp != null) ? ppp : loopback;
 -    }
 -}
---- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java	Sat Oct 06 10:26:40 2018 +0100
+--- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java	Sat Jun 23 21:02:10 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,48 +0,0 @@
 -/*
@@ -13872,7 +13744,7 @@ 
 -    }
 -
 -}
---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java	Sat Oct 06 10:26:40 2018 +0100
+--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java	Sat Jun 23 21:02:10 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,213 +0,0 @@
 -/*
@@ -14088,7 +13960,7 @@ 
 -                               long timeout);
 -    private static native void interrupt(int fd);
 -}
---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java	Sat Oct 06 10:26:40 2018 +0100
+--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java	Sat Jun 23 21:02:10 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,263 +0,0 @@
 -/*
@@ -14354,7 +14226,7 @@ 
 -        return this;
 -    }
 -}
---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java	Sat Oct 06 10:26:40 2018 +0100
+--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java	Sat Jun 23 21:02:10 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,44 +0,0 @@
 -/*
@@ -14401,7 +14273,7 @@ 
 -        return new KQueueSelectorImpl(this);
 -    }
 -}
---- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c	Sat Oct 06 10:26:40 2018 +0100
+--- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c	Sat Jun 23 21:02:10 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,171 +0,0 @@
 -/*
@@ -14575,8 +14447,8 @@ 
 -    }
 -}
 -
---- ./jdk/src/share/bin/jli_util.h	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/bin/jli_util.h	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/bin/jli_util.h	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/bin/jli_util.h	Sun Sep 02 07:33:40 2018 -0700
 @@ -87,7 +87,7 @@
  #define _LARGFILE64_SOURCE
  #define JLI_Lseek                       lseek64
@@ -14586,8 +14458,8 @@ 
  #define JLI_Lseek                       lseek
  #endif
  #ifdef _AIX
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -1146,7 +1146,7 @@
       */
      HashMap<String, Boolean> existsMap;
@@ -14597,8 +14469,8 @@ 
              return false;
          } else if (existsMap == null) {
             existsMap = new HashMap<String, Boolean>();
---- ./jdk/src/share/classes/sun/awt/OSInfo.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/classes/sun/awt/OSInfo.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/classes/sun/awt/OSInfo.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -39,6 +39,7 @@
          WINDOWS,
          LINUX,
@@ -14618,8 +14490,8 @@ 
              if (osName.contains("OS X")) {
                  return MACOSX;
              }
---- ./jdk/src/share/classes/sun/font/FontUtilities.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/classes/sun/font/FontUtilities.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/classes/sun/font/FontUtilities.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -48,6 +48,8 @@
  
      public static boolean isLinux;
@@ -14638,8 +14510,8 @@ 
                  isMacOSX = osName.contains("OS X"); // TODO: MacOSX
  
                  String t2kStr = System.getProperty("sun.java2d.font.scaler");
---- ./jdk/src/share/classes/sun/font/SunFontManager.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/classes/sun/font/SunFontManager.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/classes/sun/font/SunFontManager.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -418,7 +418,7 @@
                           * registerFonts method as on-screen these JRE fonts
                           * always go through the T2K rasteriser.
@@ -14649,8 +14521,8 @@ 
                              /* Linux font configuration uses these fonts */
                              registerFontDir(jreFontDirName);
                          }
---- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -1306,7 +1306,7 @@
          String osName = AccessController.doPrivileged(
              new GetPropertyAction("os.name"));
@@ -14660,8 +14532,8 @@ 
              charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
                      new String[] {
                          "COMPOUND_TEXT",        // JDK historical
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -1587,9 +1587,31 @@
          }
  
@@ -14696,8 +14568,8 @@ 
              if ((pFlags & PRINTER) != 0) {
                  execCmd[n++] = "-P" + printer;
              }
---- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -48,6 +48,7 @@
                      public Boolean run() {
                              String osname = System.getProperty("os.name");
@@ -14706,8 +14578,8 @@ 
                                  osname.contains("OS X") ||
                                  osname.startsWith("Linux")) {
                                  return new Boolean(System.getProperty
---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -90,6 +90,12 @@
                                      "libgssapi_krb5.so",
                                      "libgssapi_krb5.so.2",
@@ -14721,8 +14593,8 @@ 
                              } else if (osname.contains("OS X")) {
                                  gssLibs = new String[]{
                                      "libgssapi_krb5.dylib",
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Sun Sep 02 07:33:40 2018 -0700
 @@ -31,4 +31,5 @@
  #[windows]sun.tools.attach.WindowsAttachProvider
  #[linux]sun.tools.attach.LinuxAttachProvider
@@ -14730,7 +14602,7 @@ 
 +#[bsd]sun.tools.attach.BsdAttachProvider
  #[aix]sun.tools.attach.AixAttachProvider
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/lib/security/java.security-bsd	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/src/share/lib/security/java.security-bsd	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,983 @@
 +#
 +# This is the "master security properties file".
@@ -15715,28 +15587,8 @@ 
 +# and javax.crypto.spec.SecretKeySpec and rejects all the others.
 +jceks.key.serialFilter = java.lang.Enum;java.security.KeyRep;\
 +  java.security.KeyRep$Type;javax.crypto.spec.SecretKeySpec;!*
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp	Sat Dec 01 12:24:15 2018 -0800
-@@ -292,7 +292,7 @@
- 
-   if (uPtr->aborting()) {
-     THROW_IOE(uPtr->get_abort_message());
--    return false;
-+    return null;
-   }
- 
-   // We have fetched all the files.
-@@ -310,7 +310,7 @@
- JNIEXPORT jlong JNICALL
- Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
-   unpacker* uPtr = get_unpacker(env, pObj, false);
--  CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
-+  CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0L);
-   size_t consumed = uPtr->input_consumed();
-   free_unpacker(env, pObj, uPtr);
-   return consumed;
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Sun Sep 02 07:33:40 2018 -0700
 @@ -62,7 +62,7 @@
  
  #endif // End of ZLIB
@@ -15746,8 +15598,8 @@ 
  #define SWAP_BYTES(a) \
      ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
  #else
---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -121,7 +121,7 @@
  }
  
@@ -15775,8 +15627,8 @@ 
  #define MAP_NATIVE2LE16(a) (a)
  #define MAP_NATIVE2BE16(a) MAP_SWAP16_impl(a)
  #define MAP_NATIVE2LE32(a) (a)
---- ./jdk/src/share/native/com/sun/media/sound/Utilities.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/com/sun/media/sound/Utilities.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -28,7 +28,7 @@
  
  
@@ -15786,8 +15638,8 @@ 
      return 0;
  #else
      return 1;
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Sun Sep 02 07:33:40 2018 -0700
 @@ -40,7 +40,7 @@
  #endif
  #endif
@@ -15797,8 +15649,8 @@ 
  #define __HI(x) *(1+(int*)&x)
  #define __LO(x) *(int*)&x
  #define __HIp(x) *(1+(int*)x)
---- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -624,7 +624,7 @@
      switch(type) {
          case java_awt_image_BufferedImage_TYPE_INT_ARGB:
@@ -15826,8 +15678,8 @@ 
              colorOrder[0] = 2;
              colorOrder[1] = 1;
              colorOrder[2] = 0;
---- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -1198,7 +1198,7 @@
  
  #define NLUT 8
@@ -15837,8 +15689,8 @@ 
  #define INDEXES    { 3, 2, 1, 0, 7, 6, 5, 4 }
  #else
  #define INDEXES    { 0, 1, 2, 3, 4, 5, 6, 7 }
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -86,7 +86,7 @@
  #endif /* MLIB_USE_FTOI_CLAMPING */
  
@@ -15878,8 +15730,8 @@ 
  
  #endif /* _NO_LONGLONG */
  
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -15919,8 +15771,8 @@ 
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -15960,8 +15812,8 @@ 
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -16001,8 +15853,8 @@ 
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -95,7 +95,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -16042,8 +15894,8 @@ 
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -16083,8 +15935,8 @@ 
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -16124,8 +15976,8 @@ 
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -95,7 +95,7 @@
      dst = dp[0];
      if (ld_offset + size < 32) {
@@ -16345,8 +16197,8 @@ 
    }
  
  #else  /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -168,7 +168,7 @@
  }
  
@@ -16627,8 +16479,8 @@ 
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -88,7 +88,7 @@
  } d64_2_f32;
  
@@ -16780,8 +16632,8 @@ 
  
    ((mlib_u32*)lh)[0] = l;  ((mlib_u32*)lh)[1] = l;
    ((mlib_u32*)lh)[2] = l;  ((mlib_u32*)lh)[3] = h;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -30,7 +30,7 @@
  typedef union {
    mlib_d64 db;
@@ -16791,8 +16643,8 @@ 
      mlib_s32 int1, int0;
  #else
      mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -275,11 +275,11 @@
        for (i = 0; j <= (b_size - 4); j += 4, i++) {
          src0 = src1;
@@ -16891,8 +16743,8 @@ 
          s0 = s1;
          dp += SIZE;
          sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -120,7 +120,7 @@
    }                                                               \
  }
@@ -18125,8 +17977,8 @@ 
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Sun Sep 02 07:33:40 2018 -0700
 @@ -27,9 +27,6 @@
  #ifndef MLIB_IMAGE_H
  #define MLIB_IMAGE_H
@@ -18137,8 +17989,8 @@ 
  #include <mlib_types.h>
  #include <mlib_status.h>
  #include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -29,7 +29,7 @@
  #ifdef MACOSX
  #include <unistd.h>
@@ -18158,8 +18010,8 @@ 
  #else
    return (void *) memalign(8, size);
  #endif /* _MSC_VER */
---- ./jdk/src/share/native/sun/font/layout/LEStandalone.h	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/font/layout/LEStandalone.h	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h	Sun Sep 02 07:33:40 2018 -0700
 @@ -136,7 +136,7 @@
  #define U_CAPI extern "C"
  
@@ -18169,8 +18021,8 @@ 
          #define U_IS_BIG_ENDIAN 0
      #endif
  #endif
---- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -182,7 +182,7 @@
          return 0L;
      }
@@ -18180,8 +18032,8 @@ 
      /* Reversing data packed into int for LE archs */
      if (isInIntPacked) {
          inFormatter ^= DOSWAP_SH(1);
---- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -27,6 +27,7 @@
  #include <jni.h>
  #include "management.h"
@@ -18190,8 +18042,8 @@ 
  
  JNIEXPORT void JNICALL Java_sun_management_DiagnosticCommandImpl_setNotificationEnabled
  (JNIEnv *env, jobject dummy, jboolean enabled) {
---- ./jdk/src/solaris/back/util_md.h	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/back/util_md.h	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/back/util_md.h	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/back/util_md.h	Sun Sep 02 07:33:40 2018 -0700
 @@ -51,7 +51,7 @@
  
  /* On little endian machines, convert java big endian numbers. */
@@ -18201,8 +18053,8 @@ 
  
  #define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
  #define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
---- ./jdk/src/solaris/bin/ergo_i586.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/bin/ergo_i586.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/bin/ergo_i586.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/bin/ergo_i586.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -106,7 +106,7 @@
  
  #endif /* __solaris__ */
@@ -18221,8 +18073,8 @@ 
  
  /*
   * Routines shared by solaris-i586 and linux-i586.
---- ./jdk/src/solaris/bin/java_md_solinux.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/bin/java_md_solinux.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/bin/java_md_solinux.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/bin/java_md_solinux.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -35,6 +35,9 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -18314,8 +18166,8 @@ 
  }
  
  int
---- ./jdk/src/solaris/bin/java_md_solinux.h	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/bin/java_md_solinux.h	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/bin/java_md_solinux.h	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/bin/java_md_solinux.h	Sun Sep 02 07:33:40 2018 -0700
 @@ -26,17 +26,26 @@
  #ifndef JAVA_MD_SOLINUX_H
  #define JAVA_MD_SOLINUX_H
@@ -18356,8 +18208,8 @@ 
  #else /* !__solaris__, i.e. Linux, AIX,.. */
  static const char *system_dir   = "/usr/java";
  static const char *user_dir     = "/java";
---- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -82,6 +82,8 @@
  
          LINUX(LaunchMechanism.VFORK, LaunchMechanism.FORK),
@@ -18405,8 +18257,8 @@ 
              case BSD:
              case AIX:
                  // There is a risk that pid will be recycled, causing us to
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -234,7 +234,7 @@
          if (fontID != null) {
              fileName = (String)fontNameMap.get(fontID);
@@ -18434,8 +18286,8 @@ 
               (!mFontConfig.foundOsSpecificFile() ||
                !mFontConfig.fontFilesArePresent()) ||
               (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties	Sun Sep 02 07:33:40 2018 -0700
 @@ -26,134 +26,134 @@
  
  # Version
@@ -18698,8 +18550,8 @@ 
 +filename.NanumGothic_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumGothicBold.ttf
 +filename.NanumMyeongjo=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjo.ttf
 +filename.NanumMyeongjo_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjoBold.ttf
---- ./jdk/src/solaris/classes/sun/net/PortConfig.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/classes/sun/net/PortConfig.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -52,7 +52,7 @@
                      } else if (os.startsWith("SunOS")) {
                          defaultLower = 32768;
@@ -18709,8 +18561,8 @@ 
                          defaultLower = 49152;
                          defaultUpper = 65535;
                      } else if (os.startsWith("AIX")) {
---- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -66,7 +66,7 @@
              return createProvider("sun.nio.ch.SolarisAsynchronousChannelProvider");
          if (osname.equals("Linux"))
@@ -18720,8 +18572,8 @@ 
              return createProvider("sun.nio.ch.BsdAsynchronousChannelProvider");
          if (osname.equals("AIX"))
              return createProvider("sun.nio.ch.AixAsynchronousChannelProvider");
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -25,10 +25,14 @@
  
  package sun.nio.fs;
@@ -18755,8 +18607,8 @@ 
 +                     new MagicFileTypeDetector());
 +    }
  }
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -61,6 +61,8 @@
              return createProvider("sun.nio.fs.SolarisFileSystemProvider");
          if (osname.equals("Linux"))
@@ -18766,8 +18618,8 @@ 
          if (osname.contains("OS X"))
              return createProvider("sun.nio.fs.MacOSXFileSystemProvider");
          if (osname.equals("AIX"))
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -161,6 +161,7 @@
  
      static boolean isBSD() {
@@ -18791,8 +18643,8 @@ 
          "/usr/sbin/lpc status all | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}' | sort"
      };
  
---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -273,7 +273,7 @@
              try {
                  b = s.getBytes("UTF-8");
@@ -18802,8 +18654,8 @@ 
              }
              BsdVirtualMachine.write(fd, b, 0, b.length);
          }
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -675,6 +675,7 @@
              return -1;
          }
@@ -18820,8 +18672,8 @@ 
      } else if (err == -EAGAIN) {
          TRACE0("xrun_recovery: EAGAIN try again flag.\n");
          return 0;
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -140,7 +140,7 @@
                                        (float) ((int) sr->samp_rates[s]),
                                        DAUDIO_PCM, /* encoding - let's only do PCM */
@@ -18831,8 +18683,8 @@ 
                                        FALSE /* little endian */
  #else
                                        (bits[b] > 8)?TRUE:FALSE  /* big endian */
---- ./jdk/src/solaris/native/common/jni_util_md.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/common/jni_util_md.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/common/jni_util_md.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/common/jni_util_md.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -28,6 +28,7 @@
  #include "jni.h"
  #include "jni_util.h"
@@ -18841,8 +18693,8 @@ 
  
  jstring nativeNewStringPlatform(JNIEnv *env, const char *str) {
      return NULL;
---- ./jdk/src/solaris/native/java/lang/java_props_md.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -111,7 +111,7 @@
      lc = setlocale(cat, NULL);
  #endif
@@ -18877,8 +18729,8 @@ 
  
      /* user properties */
      {
---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -36,20 +36,13 @@
  #include <stdlib.h>
  #include <ctype.h>
@@ -18901,7 +18753,7 @@ 
  
  
  #if defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R)
-@@ -415,6 +408,17 @@
+@@ -417,6 +410,17 @@
      }
  #endif
  
@@ -18919,8 +18771,8 @@ 
      error = getaddrinfo(hostname, NULL, &hints, &res);
  
      if (error) {
---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -33,7 +33,7 @@
  #include <strings.h>
  #include <stdlib.h>
@@ -18930,7 +18782,7 @@ 
  #include <ifaddrs.h>
  #include <net/if.h>
  #include <unistd.h> /* gethostname */
-@@ -99,9 +99,9 @@
+@@ -112,9 +112,9 @@
      return (*env)->NewStringUTF(env, hostname);
  }
  
@@ -18942,7 +18794,7 @@ 
  lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6)
  {
      jobjectArray result = NULL;
-@@ -256,6 +256,19 @@
+@@ -269,6 +269,19 @@
      hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE);
      CHECK_NULL_RETURN(hostname, NULL);
  
@@ -18962,8 +18814,8 @@ 
  #ifdef AF_INET6
      /* Try once, with our static buffer. */
      memset(&hints, 0, sizeof(hints));
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -58,14 +58,19 @@
  #include <sys/param.h>
  #include <sys/ioctl.h>
@@ -18986,8 +18838,8 @@ 
  
  #include "jvm.h"
  #include "jni_util.h"
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -2243,7 +2243,7 @@
                  }
              }
@@ -18997,8 +18849,8 @@ 
              if (family == AF_INET6 && index == 0) {
                  index = getDefaultScopeID(env);
              }
---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -215,6 +215,7 @@
      }
  
@@ -19015,8 +18867,8 @@ 
  #endif /* AF_INET6 */
  
      /*
---- ./jdk/src/solaris/native/java/net/bsd_close.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/java/net/bsd_close.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/java/net/bsd_close.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/java/net/bsd_close.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -320,11 +320,8 @@
  }
  
@@ -19106,8 +18958,8 @@ 
      }
 +#endif
  }
---- ./jdk/src/solaris/native/java/net/net_util_md.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/java/net/net_util_md.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/java/net/net_util_md.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -46,6 +46,10 @@
  #endif
  #endif
@@ -19128,8 +18980,8 @@ 
      static jclass ni_class = NULL;
      static jfieldID ni_defaultIndexID;
      if (ni_class == NULL) {
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -56,7 +56,11 @@
  #endif
  
@@ -19193,8 +19045,8 @@ 
  }
 -#endif /* MACOSX */
 +#endif /* _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -255,7 +255,7 @@
              if (strcmp(style, "regular") == 0) {
                  altstyle = "roman";
@@ -19204,8 +19056,8 @@ 
              if (!strcmp(family, "lucidasans")) {
                  family = "lucida";
              }
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -121,7 +121,7 @@
   */
  
@@ -19290,8 +19142,8 @@ 
  #endif /* HEADLESS */
      return point;
  }
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -52,7 +52,7 @@
                                  XIMPreeditDrawCallbackStruct *);
  static void PreeditCaretCallback(XIC, XPointer,
@@ -19511,9 +19363,9 @@ 
      AWT_LOCK();
      adjustStatusWindow(window);
      AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Sat Dec 01 12:24:15 2018 -0800
-@@ -48,7 +48,7 @@
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Sun Sep 02 07:33:40 2018 -0700
+@@ -45,7 +45,7 @@
  #include "wsutils.h"
  #include "list.h"
  #include "multiVis.h"
@@ -19522,8 +19374,8 @@ 
  #include <sys/socket.h>
  #endif
  
---- ./jdk/src/solaris/native/sun/awt/extutil.h	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/awt/extutil.h	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/awt/extutil.h	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/awt/extutil.h	Sun Sep 02 07:33:40 2018 -0700
 @@ -58,7 +58,7 @@
   */
  /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -19539,8 +19391,8 @@ 
  
 -#endif /* __linux__ || MACOSX */
 +#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -23,9 +23,9 @@
   * questions.
   */
@@ -19620,17 +19472,17 @@ 
      }
  #endif
      }
-@@ -1247,7 +1262,7 @@
+@@ -1237,7 +1252,7 @@
               */
              if (fontformat != NULL
                  && (strcmp((char*)fontformat, "TrueType") != 0)
 -#if defined(__linux__) || defined(_AIX)
 +#if defined(__linux__) || defined(_AIX) || defined(_ALLBSD_SOURCE)
                  && (strcmp((char*)fontformat, "Type 1") != 0)
-                 && !(isOpenJDK && (strcmp((char*)fontformat, "CFF") == 0))
  #endif
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Sat Dec 01 12:24:15 2018 -0800
+              ) {
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Sun Sep 02 07:33:40 2018 -0700
 @@ -28,11 +28,11 @@
  #include <sys/types.h>
  
@@ -19646,8 +19498,8 @@ 
  
  typedef unsigned char   jubyte;
  typedef unsigned short  jushort;
---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -63,9 +63,6 @@
   *    MLIB_EDGE_SRC_PADDED
   */
@@ -19752,8 +19604,8 @@ 
          LOGIC(da[0], dtmp, dtmp1, |);
        }
        else {                                               /* aligned */
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -804,7 +804,7 @@
  static int initialized;
  static int usevis = JNI_TRUE;
@@ -19764,7 +19616,7 @@ 
  #else
  #   define ULTRA_CHIP   "sun4u"
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c	Sat Dec 01 12:24:15 2018 -0800
++++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -0,0 +1,42 @@
 +/*
 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -19808,8 +19660,8 @@ 
 +{
 +    return (jdouble) -1;
 +}
---- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -56,6 +56,9 @@
  #include <limits.h>
  #include <stdlib.h>
@@ -19974,8 +19826,8 @@ 
          return -1;
      }
  
---- ./jdk/src/solaris/native/sun/net/portconfig.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/net/portconfig.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/net/portconfig.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/net/portconfig.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -67,6 +67,24 @@
          range->lower = net_getParam("/dev/tcp", "tcp_smallest_anon_port");
          return 0;
@@ -20001,8 +19853,8 @@ 
  #elif defined(_ALLBSD_SOURCE)
      {
          int ret;
---- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h	Sun Sep 02 07:33:40 2018 -0700
 @@ -67,7 +67,7 @@
  
  
@@ -20051,8 +19903,8 @@ 
  jboolean loadSocketExtensionFuncs(JNIEnv* env);
  
  #endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -58,6 +58,7 @@
   */
  jboolean loadSocketExtensionFuncs
@@ -20069,8 +19921,8 @@ 
  
      funcsLoaded = JNI_TRUE;
      return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -31,6 +31,12 @@
  #include <dlfcn.h>
  #include <string.h>
@@ -20093,8 +19945,8 @@ 
          if (magic_handle == NULL) {
              return JNI_FALSE;
          }
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -54,7 +54,7 @@
      }
  
@@ -20104,8 +19956,8 @@ 
      void *hModule = dlopen(libName, RTLD_LAZY);
  #else
      void *hModule = dlopen(libName, RTLD_NOLOAD);
---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -38,7 +38,9 @@
  #include <sys/types.h>
  #include <sys/socket.h>
@@ -20116,8 +19968,8 @@ 
  #include <sys/un.h>
  #include <fcntl.h>
  
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -886,7 +886,7 @@
  {
      KeySym originalKeysym = *keysym;
@@ -20127,8 +19979,8 @@ 
      /* The following code on Linux will cause the keypad keys
       * not to echo on JTextField when the NumLock is on. The
       * keysyms will be 0, because the last parameter 2 is not defined.
---- ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp	Sun Sep 02 07:33:40 2018 -0700
 @@ -308,7 +308,7 @@
                                        DAUDIO_PCM,
                                        (bitsArray[bitIndex]==8)?FALSE:TRUE,  /* signed */
@@ -20147,14 +19999,3 @@ 
          isBigEndian
  #else
          !isBigEndian
---- ./nashorn/test/script/jfx.js	Sat Oct 06 10:28:09 2018 +0100
-+++ ./nashorn/test/script/jfx.js	Wed Nov 21 19:36:40 2018 -0800
-@@ -93,6 +93,8 @@
-         f2 = new File(sb.append(fsep + "linux.png").toString());
-     } else if (OSInfo.getOSType() == OSType.MACOSX) {
-         f2 = new File(sb.append(fsep + "macosx.png").toString());
-+    } else if (OSInfo.getOSType() == OSType.BSD) {
-+        f2 = new File(sb.append(fsep + "bsd.png").toString());
-     }
-     if (f1.exists() && f2.exists()) {
-         var image1 = new AWTImage(PNGDecoder.decode(f1.getAbsolutePath()));
--- b/java/openjdk8/files/patch-bsd-test	
+++ b/java/openjdk8/files/patch-bsd-test	
@@ -1,5 +1,5 @@ 
---- ./hotspot/test/compiler/5091921/Test7005594.sh	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/test/compiler/5091921/Test7005594.sh	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/test/compiler/5091921/Test7005594.sh	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/test/compiler/5091921/Test7005594.sh	Mon Sep 03 11:13:04 2018 -0700
 @@ -60,6 +60,15 @@
    # Windows/MKS
    MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
@@ -16,8 +16,8 @@ 
  else
    echo "Unable to determine amount of physical memory on the machine"
  fi
---- ./hotspot/test/compiler/6894807/Test6894807.sh	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/test/compiler/6894807/Test6894807.sh	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/test/compiler/6894807/Test6894807.sh	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/test/compiler/6894807/Test6894807.sh	Mon Sep 03 11:13:04 2018 -0700
 @@ -21,7 +21,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -27,8 +27,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./hotspot/test/runtime/7110720/Test7110720.sh	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/test/runtime/7110720/Test7110720.sh	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/test/runtime/7110720/Test7110720.sh	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/test/runtime/7110720/Test7110720.sh	Mon Sep 03 11:13:04 2018 -0700
 @@ -28,7 +28,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -38,8 +38,8 @@ 
      FS="/"
      RM=/bin/rm
      CP=/bin/cp
---- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -37,8 +37,8 @@
      public static void main(String args[]) throws Throwable {
  
@@ -51,8 +51,8 @@ 
              return;
          }
  
---- ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -47,6 +47,8 @@
              osDependentBaseString = "lib%s.dylib";
          } else if (Platform.isLinux()) {
@@ -62,8 +62,8 @@ 
          }
  
          if (osDependentBaseString == null) {
---- ./hotspot/test/test_env.sh	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/test/test_env.sh	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/test/test_env.sh	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/test/test_env.sh	Mon Sep 03 11:13:04 2018 -0700
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -73,8 +73,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java	Sat Oct 06 10:25:04 2018 +0100
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java	Sat Dec 01 12:42:05 2018 -0800
+--- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java	Sat Jun 23 21:01:40 2018 -0700
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java	Mon Sep 03 11:13:04 2018 -0700
 @@ -67,6 +67,10 @@
          return isOs("aix");
      }
@@ -86,8 +86,8 @@ 
      public static boolean isLinux() {
          return isOs("linux");
      }
---- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -97,8 +97,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -108,8 +108,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -56,7 +56,7 @@
  
  OS=`uname -s`
@@ -119,8 +119,8 @@ 
        PATHSEP=":"
        ;;
  
---- ./jdk/test/com/sun/jdi/JITDebug.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/com/sun/jdi/JITDebug.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/com/sun/jdi/JITDebug.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/com/sun/jdi/JITDebug.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -63,7 +63,7 @@
  OS=`uname -s`
  export TRANSPORT_METHOD
@@ -130,8 +130,8 @@ 
        PATHSEP=":"
        TRANSPORT_METHOD=dt_socket
        ;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -106,7 +106,7 @@
      xx=`find ${jreloc}/lib -name libdt_socket.so`
      libloc=`dirname ${xx}`
@@ -141,8 +141,8 @@ 
      libloc=${jreloc}/lib
      ;;
    Windows*)
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -284,7 +284,7 @@
           psCmd=ps
           jstack=jstack.exe
@@ -152,8 +152,8 @@ 
           transport=dt_socket
           address=
           devnull=/dev/null
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -45,7 +45,7 @@
  
  OS=`uname -s`
@@ -163,8 +163,8 @@ 
      PS=":"
      ;;
    Windows* | CYGWIN*)
---- ./jdk/test/java/awt/JAWT/JAWT.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/awt/JAWT/JAWT.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/awt/JAWT/JAWT.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/awt/JAWT/JAWT.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -62,6 +62,23 @@
  	MAKE="make"
  	LD_LIBRARY_PATH="."
@@ -198,8 +198,8 @@ 
      exit 0;
      ;;
    * )
---- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -86,6 +86,14 @@
        TMP="/tmp"
        ;;
@@ -215,8 +215,8 @@ 
     Windows* )
        VAR="A different value for Win32"
        DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
---- ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -59,7 +59,7 @@
  # Checking for proper OS
  OS=`uname -s`
@@ -226,8 +226,8 @@ 
        FILESEP="/"
        ;;
      
---- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -119,6 +119,14 @@
        TMP="/tmp"
        ;;
@@ -243,8 +243,8 @@ 
     Windows* )
        VAR="A different value for Win32"
        DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
---- ./jdk/test/java/io/File/GetXSpace.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/io/File/GetXSpace.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/io/File/GetXSpace.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/io/File/GetXSpace.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -51,7 +51,7 @@
      private static final String dfFormat;
      static {
@@ -254,8 +254,8 @@ 
              // FileSystem Total Used Available Use% MountedOn
              dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)";
          } else if (name.startsWith("Windows")) {
---- ./jdk/test/java/io/File/GetXSpace.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/io/File/GetXSpace.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/io/File/GetXSpace.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/io/File/GetXSpace.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -26,7 +26,7 @@
  # set platform-dependent variable
  OS=`uname -s`
@@ -265,8 +265,8 @@ 
    Windows_98 )    return    ;;
    Windows* )      SID=`sid`; TMP="c:/temp"  ;;
    * )
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -45,7 +45,7 @@
  # Need to determine the classpath separator and filepath separator based on the
  # operating system.
@@ -276,8 +276,8 @@ 
    PS=":"  ;;
  Windows* | CYGWIN* )
    PS=";"  ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -287,8 +287,8 @@ 
      PS=":"    ;;
    Windows* | CYGWIN* )
      PS=";"    ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -298,8 +298,8 @@ 
      PS=":"    ;;
    Windows* | CYGWIN* )
      PS=";"    ;;
---- ./jdk/test/java/lang/ClassLoader/Assert.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/lang/ClassLoader/Assert.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/lang/ClassLoader/Assert.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/lang/ClassLoader/Assert.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -25,7 +25,7 @@
  
  OS=`uname -s`
@@ -309,8 +309,8 @@ 
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
      ;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -55,7 +55,7 @@
    Linux )
      FS="/"
@@ -320,8 +320,8 @@ 
      FS="/"
      ;;
    AIX )
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -60,7 +60,7 @@
    Linux )
      FS="/"
@@ -331,8 +331,8 @@ 
      FS="/"
      ;;
    AIX )
---- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -148,6 +148,9 @@
          } else if (osName.startsWith("Linux") == true) {
              return new UnixTest(
@@ -343,8 +343,8 @@ 
          } else if (osName.startsWith("Mac OS")) {
              return new MacTest(
                  File.createTempFile("ProcessTrap-", ".sh",null));
---- ./jdk/test/java/lang/ProcessBuilder/Zombies.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/lang/ProcessBuilder/Zombies.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -34,7 +34,7 @@
  
      static final String os = System.getProperty("os.name");
@@ -354,8 +354,8 @@ 
          "/usr/bin/true" : "/bin/true";
  
      public static void main(String[] args) throws Throwable {
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -30,7 +30,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -365,8 +365,8 @@ 
    Windows* | CYGWIN* )
      echo "Passed"; exit 0 ;;
    * ) echo "Unrecognized system!" ;  exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -376,8 +376,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -55,7 +55,7 @@
  
  OS=`uname -s`
@@ -387,8 +387,8 @@ 
        PATHSEP=":"
        ;;
  
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -43,7 +43,7 @@
      PS=":"
      FS="/"
@@ -398,8 +398,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -79,8 +79,10 @@
          System.out.println("Test passed.");
      }
@@ -421,8 +421,8 @@ 
                  ? output.split(" ")
                  : output.split(",");
          double expected = Double.parseDouble(lavg[0]);
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -61,7 +61,7 @@
  while true; do
    echo "Run $i: TestSystemLoadAvg"
@@ -432,8 +432,8 @@ 
           runOne GetSystemLoadAverage
           ;;
        * )
---- ./jdk/test/java/net/Authenticator/B4933582.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/net/Authenticator/B4933582.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/net/Authenticator/B4933582.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/net/Authenticator/B4933582.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -26,7 +26,7 @@
  
  OS=`uname -s`
@@ -443,8 +443,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/DatagramSocket/Send12k.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/net/DatagramSocket/Send12k.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/net/DatagramSocket/Send12k.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/net/DatagramSocket/Send12k.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -36,9 +36,10 @@
  
      public static void main(String args[]) throws Exception {
@@ -458,8 +458,8 @@ 
               SEND_SIZE = 16 * 576;
           } else {
               SEND_SIZE = 16 * 1024;
---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -45,6 +45,8 @@
              return (true);
          if (p.getProperty ("os.name").equals ("Linux"))
@@ -469,8 +469,8 @@ 
          if (p.getProperty ("os.name").startsWith ("Mac OS"))
              return (true);
          // Check for specific Solaris version from here
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -27,11 +27,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -484,8 +484,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -495,8 +495,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URL/B5086147.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/net/URL/B5086147.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/net/URL/B5086147.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/net/URL/B5086147.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -26,7 +26,7 @@
  
  OS=`uname -s`
@@ -506,8 +506,8 @@ 
      exit 0
      ;;
    CYGWIN* )
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -34,11 +34,7 @@
  
  OS=`uname -s`
@@ -521,8 +521,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -27,11 +27,7 @@
  
  OS=`uname -s`
@@ -536,8 +536,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/net/URLConnection/6212146/test.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/net/URLConnection/6212146/test.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -33,11 +33,7 @@
  
  OS=`uname -s`
@@ -551,8 +551,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/nio/channels/FileChannel/Transfer.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/nio/channels/FileChannel/Transfer.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -228,7 +228,7 @@
          // Windows and Linux can't handle the really large file sizes for a
          // truncate or a positional write required by the test for 4563125
@@ -562,8 +562,8 @@ 
              return;
          File source = File.createTempFile("blah", null);
          source.deleteOnExit();
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c	Sun Sep 02 07:33:40 2018 -0700
 @@ -17,6 +17,12 @@
  
  #include "Launcher.h"
@@ -586,8 +586,8 @@ 
          _exit(-1);
      }
  
---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -34,7 +34,7 @@
  
  OS=`uname -s`
@@ -597,8 +597,8 @@ 
    # Skip locale test for Windows
    Windows* | CYGWIN* )
      echo "Passed"; exit 0 ;;
---- ./jdk/test/java/nio/charset/spi/basic.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/nio/charset/spi/basic.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/nio/charset/spi/basic.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/nio/charset/spi/basic.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -48,7 +48,7 @@
  
  DIR=`pwd`
@@ -608,8 +608,8 @@ 
    Windows* )      CPS=';' ;;
    CYGWIN*  )
      DIR=`/usr/bin/cygpath -a -s -m $DIR`
---- ./jdk/test/java/nio/file/FileSystem/Basic.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/nio/file/FileSystem/Basic.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/nio/file/FileSystem/Basic.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/nio/file/FileSystem/Basic.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -76,7 +76,7 @@
              checkSupported(fs, "posix", "unix", "owner", "acl", "user");
          if (os.equals("Linux"))
@@ -619,8 +619,8 @@ 
              checkSupported(fs, "posix", "unix", "owner");
          if (os.equals("Windows"))
              checkSupported(fs, "owner", "dos", "acl", "user");
---- ./jdk/test/java/nio/file/Files/CopyAndMove.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/nio/file/Files/CopyAndMove.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -651,7 +651,7 @@
  
                  // check POSIX attributes are copied
@@ -639,8 +639,8 @@ 
          boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS);
  
          if (isUnix) {
---- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -33,7 +33,7 @@
  
  OS=`uname -s`
@@ -650,8 +650,8 @@ 
      PS=":"
      ;;
    Windows* | CYGWIN* )
---- ./jdk/test/java/rmi/registry/readTest/readTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/rmi/registry/readTest/readTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -34,7 +34,7 @@
  REGARGS=""
  
@@ -661,8 +661,8 @@ 
      PS=":"
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -58,7 +58,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -672,8 +672,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -42,7 +42,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -683,8 +683,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -66,7 +66,7 @@
      PATHSEP=";"
      FILESEP="/"
@@ -694,8 +694,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -58,7 +58,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -705,8 +705,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/security/Security/signedfirst/Static.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/security/Security/signedfirst/Static.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -58,7 +58,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -716,8 +716,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/util/Currency/PropertiesTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/util/Currency/PropertiesTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -52,7 +52,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -727,8 +727,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -62,7 +62,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -738,8 +738,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -31,7 +31,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -749,8 +749,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/util/ServiceLoader/basic.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/util/ServiceLoader/basic.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/util/ServiceLoader/basic.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -43,9 +43,7 @@
  
  OS=`uname -s`
@@ -762,8 +762,8 @@ 
        SEP=':' ;;
      * )
        SEP='\;' ;;
---- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -773,8 +773,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -56,7 +56,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -784,8 +784,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -89,7 +89,7 @@
        FILESEP="/"
        ;;
@@ -795,8 +795,8 @@ 
        VAR="A different value for Linux"
        DEFAULT_JDK=/none
        #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386
---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -90,7 +90,7 @@
        FILESEP="/"
        ;;
@@ -806,8 +806,8 @@ 
        VAR="A different value for Linux"
        DEFAULT_JDK=/none
        #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386
---- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -108,6 +108,14 @@
        TMP="/tmp"
        ;;
@@ -823,8 +823,8 @@ 
     Windows* )
        VAR="A different value for Win32"
        DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
---- ./jdk/test/javax/script/CommonSetup.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/javax/script/CommonSetup.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/javax/script/CommonSetup.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/javax/script/CommonSetup.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -36,7 +36,7 @@
  
  OS=`uname -s`
@@ -834,8 +834,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -43,7 +43,7 @@
      FS="/"
      RM="/bin/rm -f"
@@ -845,8 +845,8 @@ 
      PS=":"
      FS="/"
      RM="/bin/rm -f"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -856,8 +856,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -53,8 +53,13 @@
          return isOs("linux");
      }
@@ -873,8 +873,8 @@ 
      }
  
      public static String getOsName() {
---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -107,8 +107,8 @@
  
      public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException {
@@ -886,8 +886,8 @@ 
                                 "skipping!");
              return;
          }
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -42,7 +42,7 @@
  fi
  
@@ -897,8 +897,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      DFILESEP=$FILESEP
---- ./jdk/test/sun/net/ftp/MarkResetTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/net/ftp/MarkResetTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/net/ftp/MarkResetTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/net/ftp/MarkResetTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -908,8 +908,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -919,8 +919,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -930,8 +930,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -941,8 +941,8 @@ 
      PS=":"
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/sun/nio/ch/SelProvider.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/nio/ch/SelProvider.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/nio/ch/SelProvider.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/nio/ch/SelProvider.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -39,7 +39,7 @@
                  expected = "sun.nio.ch.DevPollSelectorProvider";
              } else if ("Linux".equals(osname)) {
@@ -952,8 +952,8 @@ 
                  expected = "sun.nio.ch.KQueueSelectorProvider";
              } else {
                  return;
---- ./jdk/test/sun/security/krb5/runNameEquals.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/krb5/runNameEquals.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/krb5/runNameEquals.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -52,7 +52,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -963,8 +963,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      NATIVE=true
---- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -50,7 +50,7 @@
  
  OS=`uname -s`
@@ -974,8 +974,8 @@ 
      FS="/"
      ;;
    Windows_* )
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -66,7 +66,7 @@
      CP="${FS}bin${FS}cp"
      CHMOD="${FS}bin${FS}chmod"
@@ -985,8 +985,8 @@ 
      FS="/"
      PS=":"
      CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -67,7 +67,7 @@
      CP="${FS}bin${FS}cp"
      CHMOD="${FS}bin${FS}chmod"
@@ -996,8 +996,8 @@ 
      FS="/"
      PS=":"
      CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -50,7 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1007,8 +1007,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -52,7 +52,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -1018,8 +1018,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -59,7 +59,7 @@
      PS=":"
      FS="/"
@@ -1029,8 +1029,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -33,7 +33,7 @@
  
  OS=`uname -s`
@@ -1040,8 +1040,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -46,7 +46,7 @@
  
  OS=`uname -s`
@@ -1051,8 +1051,8 @@ 
          FILESEP="/"
          PATHSEP=":"
          ;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -32,7 +32,7 @@
  HOSTNAME=`uname -n`
  OS=`uname -s`
@@ -1062,8 +1062,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -32,7 +32,7 @@
  HOSTNAME=`uname -n`
  OS=`uname -s`
@@ -1073,8 +1073,8 @@ 
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1084,8 +1084,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1095,8 +1095,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -47,6 +47,13 @@
      FS="/"
      CP="${FS}bin${FS}cp -f"
@@ -1111,8 +1111,8 @@ 
    CYGWIN* )
      NULL=/dev/null
      PS=";"
---- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -39,6 +39,11 @@
    Windows_* )
      FS="\\"
@@ -1125,8 +1125,8 @@ 
    * )
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -42,7 +42,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1136,8 +1136,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1147,8 +1147,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -55,7 +55,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -1158,8 +1158,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -48,7 +48,7 @@
    Linux )
      FILESEP="/"
@@ -1169,8 +1169,8 @@ 
      FILESEP="/"
      ;;
    AIX )
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -45,7 +45,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1180,8 +1180,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1191,8 +1191,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1202,8 +1202,8 @@ 
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/keytool/i18n.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/keytool/i18n.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1213,8 +1213,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/keytool/printssl.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/keytool/printssl.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -40,7 +40,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1224,8 +1224,8 @@ 
      FS="/"
      ;;
    CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/keytool/resource.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/keytool/resource.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/keytool/resource.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -43,7 +43,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1235,8 +1235,8 @@ 
      NULL=/dev/null
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/standard.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/keytool/standard.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/keytool/standard.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/keytool/standard.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -45,7 +45,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1246,8 +1246,8 @@ 
      FS="/"
      ;;
    Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/policytool/Alias.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/policytool/Alias.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1257,8 +1257,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1268,8 +1268,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1279,8 +1279,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1290,8 +1290,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1301,8 +1301,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1312,8 +1312,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/security/tools/policytool/i18n.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/security/tools/policytool/i18n.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -49,7 +49,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1323,8 +1323,8 @@ 
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/tools/common/CommonSetup.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/tools/common/CommonSetup.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/tools/common/CommonSetup.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/tools/common/CommonSetup.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -47,6 +47,7 @@
  #   isLinux   - true if OS is Linux
  #   isSolaris - true if OS is Solaris
@@ -1352,8 +1352,8 @@ 
    Darwin )
      OS="Mac OS X"
      isMacos=true
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -54,7 +54,7 @@
  
  OS=`uname -s`
@@ -1363,8 +1363,8 @@ 
        PATHSEP=":"
        ;;
  
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Sun Sep 02 07:33:40 2018 -0700
 @@ -56,7 +56,7 @@
  
  OS=`uname -s`
@@ -1374,8 +1374,8 @@ 
        PATHSEP=":"
        ;;
  
---- ./jdk/test/tools/launcher/ExecutionEnvironment.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/tools/launcher/ExecutionEnvironment.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/tools/launcher/ExecutionEnvironment.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/tools/launcher/ExecutionEnvironment.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -194,7 +194,7 @@
  
          Map<String, String> env = new HashMap<>();
@@ -1385,8 +1385,8 @@ 
              for (String x : LD_PATH_STRINGS) {
                  String pairs[] = x.split("=");
                  env.put(pairs[0], pairs[1]);
---- ./jdk/test/tools/launcher/RunpathTest.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/tools/launcher/RunpathTest.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/tools/launcher/RunpathTest.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/tools/launcher/RunpathTest.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -69,7 +69,7 @@
      }
  
@@ -1396,8 +1396,8 @@ 
              RunpathTest rp = new RunpathTest();
              rp.testRpath();
          }
---- ./jdk/test/tools/launcher/Test7029048.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/tools/launcher/Test7029048.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/tools/launcher/Test7029048.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/tools/launcher/Test7029048.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -223,7 +223,7 @@
          } else if (isSolaris && passes < 9) {
              throw new Exception("Test7029048: FAIL: " +
@@ -1407,8 +1407,8 @@ 
               throw new Exception("Test7029048: FAIL: " +
                      "all tests did not run, expected " + 6 + " got " + passes);
          } else {
---- ./jdk/test/tools/launcher/TestHelper.java	Sat Oct 06 10:26:40 2018 +0100
-+++ ./jdk/test/tools/launcher/TestHelper.java	Sat Dec 01 12:24:15 2018 -0800
+--- ./jdk/test/tools/launcher/TestHelper.java	Sat Jun 23 21:02:10 2018 -0700
++++ ./jdk/test/tools/launcher/TestHelper.java	Sun Sep 02 07:33:40 2018 -0700
 @@ -94,6 +94,8 @@
              System.getProperty("os.name", "unknown").startsWith("Linux");
      static final boolean isAIX =
@@ -1418,8 +1418,8 @@ 
      static final String LIBJVM = isWindows
                          ? "jvm.dll"
                          : "libjvm" + (isMacOSX ? ".dylib" : ".so");
---- ./langtools/test/Makefile	Sat Oct 06 10:27:38 2018 +0100
-+++ ./langtools/test/Makefile	Wed Nov 21 19:36:38 2018 -0800
+--- ./langtools/test/Makefile	Sat Jun 23 21:02:19 2018 -0700
++++ ./langtools/test/Makefile	Sun Sep 02 07:33:26 2018 -0700
 @@ -34,6 +34,14 @@
      ARCH=i586
    endif
@@ -1435,8 +1435,8 @@ 
  ifeq ($(OSNAME), Darwin)
    PLATFORM = bsd
    ARCH = $(shell uname -m)
---- ./langtools/test/tools/javah/ReadOldClass.sh	Sat Oct 06 10:27:38 2018 +0100
-+++ ./langtools/test/tools/javah/ReadOldClass.sh	Wed Nov 21 19:36:38 2018 -0800
+--- ./langtools/test/tools/javah/ReadOldClass.sh	Sat Jun 23 21:02:19 2018 -0700
++++ ./langtools/test/tools/javah/ReadOldClass.sh	Sun Sep 02 07:33:26 2018 -0700
 @@ -43,7 +43,7 @@
  # set platform-dependent variables
  OS=`uname -s`
--- b/java/openjdk8/files/patch-configure	
+++ b/java/openjdk8/files/patch-configure	
@@ -1,14 +1,11 @@ 
---- configure.orig	2018-12-02 13:45:44.142931000 -0800
-+++ configure	2018-12-02 15:16:05.112400000 -0800
-@@ -29,6 +29,10 @@
- this_script_dir=`dirname $0`
- this_script_dir=`cd $this_script_dir > /dev/null && pwd`
+--- configure
++++ configure
+@@ -26,4 +26,7 @@
+ # make sure that is called using bash.
  
+ this_script_dir=`dirname $0`
+-bash $this_script_dir/common/autoconf/configure "$@"
 +export CONFIG_SHELL=%%LOCALBASE%%/bin/bash
 +export MAKE=%%LOCALBASE%%/bin/gmake
 +export OBJCOPY=%%OBJCOPY%%
-+
- # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c.
- # This trick is needed to get autoconf to co-operate properly.
--bash -c ". $this_script_dir/common/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
-+%%LOCALBASE%%/bin/bash -c ". $this_script_dir/common/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
++%%LOCALBASE%%/bin/bash $this_script_dir/common/autoconf/configure "$@"
--- /dev/null	
+++ b/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_vm.make	
@@ -0,0 +1,13 @@ 
+--- hotspot/make/bsd/makefiles/vm.make.orig
++++ hotspot/make/bsd/makefiles/vm.make
+@@ -132,6 +132,10 @@ LIBS += -lm
+ 
+ ifeq ($(USE_CLANG),)
+   LIBS += -pthread
++else
++  ifneq ($(OS_VENDOR), Darwin)
++    LIBS += -pthread
++  endif
+ endif
+ 
+ # By default, link the *.o into the library, not the executable.
--- a/java/openjdk8/files/patch-hotspot_src_cpu_ppc_vm_vm_version_ppc.cpp	
+++ /dev/null	
@@ -1,17 +0,0 @@ 
---- hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp.orig
-+++ hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
-@@ -38,8 +38,13 @@
- #ifdef TARGET_OS_FAMILY_linux
- # include "os_linux.inline.hpp"
- #endif
--
-+#ifdef TARGET_OS_FAMILY_bsd
-+# include "os_bsd.inline.hpp"
-+#endif
-+
-+#ifndef TARGET_OS_FAMILY_bsd
- # include <sys/sysinfo.h>
-+#endif
- 
- int VM_Version::_features = VM_Version::unknown_m;
- int VM_Version::_measured_cache_line_size = 128; // default value
--- a/java/openjdk8/files/patch-jdk-make-CompileJavaClasses.gmk	
+++ /dev/null	
@@ -1,18 +0,0 @@ 
---- ./jdk/make/CompileJavaClasses.gmk.orig	2018-12-13 14:57:18.491487000 +0100
-+++ ./jdk/make/CompileJavaClasses.gmk	2018-12-13 14:58:08.484490000 +0100
-@@ -129,12 +129,12 @@
-       sun/nio/fs/LinuxFileSystem.java \
-       sun/nio/fs/LinuxFileSystemProvider.java \
-       sun/nio/fs/LinuxNativeDispatcher.java \
--      sun/nio/fs/LinuxUserDefinedFileAttributeView.java \
--      sun/nio/fs/LinuxWatchService.java
-+      sun/nio/fs/LinuxUserDefinedFileAttributeView.java
- endif
- 
- ifeq (, $(filter $(OPENJDK_TARGET_OS), linux bsd))
--  EXFILES += sun/nio/fs/MagicFileTypeDetector.java
-+  EXFILES += sun/nio/fs/MagicFileTypeDetector.java \
-+      sun/nio/fs/LinuxWatchService.java
- endif
- 
- ifneq ($(OPENJDK_TARGET_OS), macosx)
--- b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk	
+++ b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk	
@@ -1,23 +1,20 @@ 
---- jdk/make/lib/Awt2dLibraries.gmk.orig	2018-12-02 16:06:28.335527000 -0800
-+++ jdk/make/lib/Awt2dLibraries.gmk	2018-12-02 16:29:22.253979000 -0800
-@@ -1236,6 +1236,11 @@
-     LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
-     LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
- 
-+  else ifeq ($(OPENJDK_TARGET_OS), bsd)
-+    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include
-+    ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
+--- jdk/make/lib/Awt2dLibraries.gmk.orig	2015-07-18 14:30:01.000000000 -0700
++++ jdk/make/lib/Awt2dLibraries.gmk	2015-07-18 14:30:08.000000000 -0700
+@@ -1259,7 +1259,7 @@
+   else ifeq ($(OPENJDK_TARGET_OS), bsd)
+     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include
+     ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
+-      LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG
 +      LIBSPLASHSCREEN_CFLAGS += %%ICONV_CPPFLAGS%%
-+    endif
-   else ifeq ($(OPENJDK_TARGET_OS), windows)
-     LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
+     endif
    else
-@@ -1257,6 +1262,8 @@
-         -framework JavaNativeFoundation
-   else ifeq ($(OPENJDK_TARGET_OS), windows)
-     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
-+  else ifeq ($(OPENJDK_TARGET_OS), bsd)
-+     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread
+     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
+@@ -1285,7 +1285,7 @@
+     # Solaris still uses OPENWIN_LIB ..
+     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
+   else ifeq ($(OPENJDK_TARGET_OS), bsd)
+-    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread
++    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread
    else	# .. all other Unixes can use X_LIBS
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
    endif
--- a/java/openjdk8/files/patch-jdk-make-lib-NioLibraries.gmk	
+++ /dev/null	
@@ -1,14 +0,0 @@ 
---- ./jdk/make/lib/NioLibraries.gmk.orig	2018-12-13 14:21:04.047810000 +0100
-+++ ./jdk/make/lib/NioLibraries.gmk	2018-12-13 14:48:16.288168000 +0100
-@@ -92,8 +92,11 @@
-       PollArrayWrapper.c \
-       UnixAsynchronousServerSocketChannelImpl.c \
-       UnixAsynchronousSocketChannelImpl.c \
-+      LinuxWatchService.c \
-       UnixCopyFile.c \
-       UnixNativeDispatcher.c
-+  BUILD_LIBNIO_CFLAGS += -I%%LOCALBASE%%/include
-+  BUILD_LIBNIO_LDFLAGS += -L%%LOCALBASE%%/lib -linotify
- endif
- 
- ifeq ($(OPENJDK_TARGET_OS), macosx)
--- a/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd	
+++ /dev/null	
@@ -1,17 +0,0 @@ 
---- ./jdk/make/mapfiles/libnio/mapfile-bsd.orig	2018-12-13 15:20:56.817147000 +0100
-+++ ./jdk/make/mapfiles/libnio/mapfile-bsd	2018-12-13 15:22:41.507010000 +0100
-@@ -143,6 +143,14 @@
- 		Java_sun_nio_fs_MagicFileTypeDetector_initialize0;
- 		Java_sun_nio_fs_MagicFileTypeDetector_probe0;
- 		Java_sun_nio_fs_UnixCopyFile_transfer;
-+		Java_sun_nio_fs_LinuxWatchService_eventSize;
-+		Java_sun_nio_fs_LinuxWatchService_eventOffsets;
-+		Java_sun_nio_fs_LinuxWatchService_inotifyInit;
-+		Java_sun_nio_fs_LinuxWatchService_inotifyAddWatch;
-+		Java_sun_nio_fs_LinuxWatchService_inotifyRmWatch;
-+		Java_sun_nio_fs_LinuxWatchService_configureBlocking;
-+		Java_sun_nio_fs_LinuxWatchService_socketpair;
-+		Java_sun_nio_fs_LinuxWatchService_poll;
- 		Java_sun_nio_fs_UnixNativeDispatcher_access0;
- 		Java_sun_nio_fs_UnixNativeDispatcher_chmod0;
- 		Java_sun_nio_fs_UnixNativeDispatcher_chown0;
--- a/java/openjdk8/files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdFileSystem.java	
+++ /dev/null	
@@ -1,15 +0,0 @@ 
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java.orig	2018-12-13 14:23:02.834223000 +0100
-+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java	2018-12-13 17:34:09.359192000 +0100
-@@ -45,8 +45,10 @@
-     public WatchService newWatchService()
-         throws IOException
-     {
--        // use polling implementation until we implement a BSD/kqueue one
--        return new PollingWatchService();
-+        if (System.getProperty("sun.nio.fs.watchservice", "").equals("polling"))
-+            return new PollingWatchService();
-+        else
-+            return new LinuxWatchService(this); // use the linux inotify implementation that wraps the kqueue calls
-     }
- 
-     // lazy initialization of the list of supported attribute views
--- a/java/openjdk8/files/patch-jdk-src-solaris-native-java-io-UnixFileSystem_md.c	
+++ /dev/null	
@@ -1,23 +0,0 @@ 
---- jdk/src/solaris/native/java/io/UnixFileSystem_md.c.orig	2018-12-12 23:07:51.229721000 +0100
-+++ jdk/src/solaris/native/java/io/UnixFileSystem_md.c	2018-12-12 23:12:21.847169000 +0100
-@@ -208,7 +208,8 @@
-     WITH_FIELD_PLATFORM_STRING(env, file, ids.path, path) {
-         struct stat64 sb;
-         if (stat64(path, &sb) == 0) {
--            rv = 1000 * (jlong)sb.st_mtime;
-+            rv  = (jlong)sb.st_mtim.tv_sec * 1000;
-+            rv += (jlong)sb.st_mtim.tv_nsec / 1000000;
-         }
-     } END_PLATFORM_STRING(env, path);
-     return rv;
-@@ -392,8 +393,8 @@
-             struct timeval tv[2];
- 
-             /* Preserve access time */
--            tv[0].tv_sec = sb.st_atime;
--            tv[0].tv_usec = 0;
-+            tv[0].tv_sec = sb.st_atim.tv_sec;
-+            tv[0].tv_usec = sb.st_atim.tv_nsec / 1000;
- 
-             /* Change last-modified time */
-             tv[1].tv_sec = time / 1000;
--- a/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c	
+++ /dev/null	
@@ -1,41 +0,0 @@ 
---- jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c.org	2018-07-26 09:56:49.897172000 +0200
-+++ jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c	2018-07-30 16:13:19.116935000 +0200
-@@ -330,11 +330,11 @@
-             break;
-         case SCTP_ADDR_MADE_PRIM :
-             event = sun_nio_ch_sctp_PeerAddrChange_SCTP_ADDR_MADE_PRIM;
--#ifdef __linux__  /* Solaris currently doesn't support SCTP_ADDR_CONFIRMED */
-+#ifndef __solaris__  /* Solaris currently doesn't support SCTP_ADDR_CONFIRMED */
-             break;
-         case SCTP_ADDR_CONFIRMED :
-             event = sun_nio_ch_sctp_PeerAddrChange_SCTP_ADDR_CONFIRMED;
--#endif  /* __linux__ */
-+#endif  /* __solaris__ */
-     }
- 
-     addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr);
-@@ -445,13 +445,13 @@
-             } else if (errno == EINTR) {
-                 return IOS_INTERRUPTED;
- 
--#ifdef __linux__
-+#ifndef __solaris__
-             } else if (errno == ENOTCONN) {
-                 /* ENOTCONN when EOF reached */
-                 rv = 0;
-                 /* there will be no control data */
-                 msg->msg_controllen = 0;
--#endif /* __linux__ */
-+#endif /* __solaris__ */
- 
-             } else {
-                 handleSocketError(env, errno);
-@@ -568,7 +568,7 @@
-     /* Set up the msghdr structure for sending */
-     memset(msg, 0, sizeof (*msg));
-     memset(cbuf, 0, cbuf_size);
--    msg->msg_name = &sa;
-+    msg->msg_name = (sa_len == 0 ? NULL : &sa);
-     msg->msg_namelen = sa_len;
-     iov->iov_base = addr;
-     iov->iov_len = length;
--- a/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-fs-UnixNativeDispatcher.c	
+++ /dev/null	
@@ -1,11 +0,0 @@ 
---- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c.orig	2018-12-13 10:02:37.501082000 +0100
-+++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c	2018-12-13 10:06:26.825382000 +0100
-@@ -453,7 +453,7 @@
-     (*env)->SetLongField(env, attrs, attrs_st_birthtime_sec, (jlong)buf->st_birthtime);
- #endif
- 
--#if (_POSIX_C_SOURCE >= 200809L) || defined(__solaris__)
-+#if (_POSIX_C_SOURCE >= 200809L) || defined(__solaris__) || defined(__FreeBSD__)
-     (*env)->SetLongField(env, attrs, attrs_st_atime_nsec, (jlong)buf->st_atim.tv_nsec);
-     (*env)->SetLongField(env, attrs, attrs_st_mtime_nsec, (jlong)buf->st_mtim.tv_nsec);
-     (*env)->SetLongField(env, attrs, attrs_st_ctime_nsec, (jlong)buf->st_ctim.tv_nsec);
--- b/lang/kf5-kross/distinfo	
+++ b/lang/kf5-kross/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691284
-SHA256 (KDE/frameworks/5.53.0/kross-5.53.0.tar.xz) = 5e7ef96c1c981d8c47928301eb1c84d69c1567ae46cf716275b2765befbdc9e0
-SIZE (KDE/frameworks/5.53.0/kross-5.53.0.tar.xz) = 127492
+TIMESTAMP = 1546843258
+SHA256 (KDE/frameworks/5.54.0/kross-5.54.0.tar.xz) = 6d8673c764d7aab41a1573151afc29a15dd28d05d4299089a253c399c64832a2
+SIZE (KDE/frameworks/5.54.0/kross-5.54.0.tar.xz) = 127504
--- b/misc/kf5-purpose/distinfo	
+++ b/misc/kf5-purpose/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691284
-SHA256 (KDE/frameworks/5.53.0/purpose-5.53.0.tar.xz) = 6ebabb1f533a7243bec4654072bbcfa792ad3a6e06a2d1d44df525996e28dbf8
-SIZE (KDE/frameworks/5.53.0/purpose-5.53.0.tar.xz) = 141932
+TIMESTAMP = 1546843259
+SHA256 (KDE/frameworks/5.54.0/purpose-5.54.0.tar.xz) = 1cf4f4aeede1846cd1ef5fc524548745c95c1b6b7d134c427ae5d3cdf1423f1f
+SIZE (KDE/frameworks/5.54.0/purpose-5.54.0.tar.xz) = 142684
--- b/misc/kf5-purpose/pkg-plist	
+++ b/misc/kf5-purpose/pkg-plist	
@@ -448,11 +448,17 @@ share/locale/zh_CN/LC_MESSAGES/purpose_twitter.mo
 share/locale/zh_CN/LC_MESSAGES/purpose_youtube.mo
 share/locale/zh_TW/LC_MESSAGES/libpurpose_quick.mo
 share/locale/zh_TW/LC_MESSAGES/libpurpose_widgets.mo
+share/locale/zh_TW/LC_MESSAGES/purpose-fileitemaction.mo
+share/locale/zh_TW/LC_MESSAGES/purpose_email.mo
 share/locale/zh_TW/LC_MESSAGES/purpose_imgur.mo
+share/locale/zh_TW/LC_MESSAGES/purpose_kdeconnect.mo
 share/locale/zh_TW/LC_MESSAGES/purpose_ktp-sendfile.mo
+share/locale/zh_TW/LC_MESSAGES/purpose_nextcloud.mo
 share/locale/zh_TW/LC_MESSAGES/purpose_pastebin.mo
+share/locale/zh_TW/LC_MESSAGES/purpose_phabricator.mo
 share/locale/zh_TW/LC_MESSAGES/purpose_reviewboard.mo
 share/locale/zh_TW/LC_MESSAGES/purpose_saveas.mo
+share/locale/zh_TW/LC_MESSAGES/purpose_twitter.mo
 share/locale/zh_TW/LC_MESSAGES/purpose_youtube.mo
 %%DATADIR%%/bluetoothplugin_config.qml
 %%DATADIR%%/kdeconnectplugin_config.qml
--- b/multimedia/kf5-kmediaplayer/distinfo	
+++ b/multimedia/kf5-kmediaplayer/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691284
-SHA256 (KDE/frameworks/5.53.0/kmediaplayer-5.53.0.tar.xz) = 134c6e641763e1671e92f803d6a6094a8bc53a46b21690f1adf05ca5aea1cce4
-SIZE (KDE/frameworks/5.53.0/kmediaplayer-5.53.0.tar.xz) = 9520
+TIMESTAMP = 1546843259
+SHA256 (KDE/frameworks/5.54.0/kmediaplayer-5.54.0.tar.xz) = cecf0a32a74ab9cecaf25bf767917d8bf7cb9619f51f5a487e7d7b6127c65461
+SIZE (KDE/frameworks/5.54.0/kmediaplayer-5.54.0.tar.xz) = 9520
--- b/net/kf5-kholidays/distinfo	
+++ b/net/kf5-kholidays/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691285
-SHA256 (KDE/frameworks/5.53.0/kholidays-5.53.0.tar.xz) = e512b0772c845042d9a0fd93d9f92c1705791b07849e84092b8f93bd6240c5fe
-SIZE (KDE/frameworks/5.53.0/kholidays-5.53.0.tar.xz) = 202116
+TIMESTAMP = 1546843259
+SHA256 (KDE/frameworks/5.54.0/kholidays-5.54.0.tar.xz) = 3e2c8eb4f094d8313cf340d7672a2f1f0c8f75c2d648d5eea06e620aedade6f6
+SIZE (KDE/frameworks/5.54.0/kholidays-5.54.0.tar.xz) = 202208
--- b/net/kf5-kxmlrpcclient/distinfo	
+++ b/net/kf5-kxmlrpcclient/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691285
-SHA256 (KDE/frameworks/5.53.0/kxmlrpcclient-5.53.0.tar.xz) = 6dfed4dc083ecce8e6d83438f6a80c747e6b253b75d59c21fe0ee05da40bda1e
-SIZE (KDE/frameworks/5.53.0/kxmlrpcclient-5.53.0.tar.xz) = 29404
+TIMESTAMP = 1546843259
+SHA256 (KDE/frameworks/5.54.0/kxmlrpcclient-5.54.0.tar.xz) = c69743cdafe74e7538baa7e857d9136b3a5a9122dcaecd3661be22ca0bf33aa5
+SIZE (KDE/frameworks/5.54.0/kxmlrpcclient-5.54.0.tar.xz) = 29412
--- b/net/kf5-syndication/distinfo	
+++ b/net/kf5-syndication/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691285
-SHA256 (KDE/frameworks/5.53.0/syndication-5.53.0.tar.xz) = cbe4bfbbfdd90401574a6c60463ffa08083ad14efac0d0ed888c04d85e46d27e
-SIZE (KDE/frameworks/5.53.0/syndication-5.53.0.tar.xz) = 159440
+TIMESTAMP = 1546843259
+SHA256 (KDE/frameworks/5.54.0/syndication-5.54.0.tar.xz) = a87f0878f5f9f6090d66212bf96f8810d5a1215ee25136763a4e1709c1b6487e
+SIZE (KDE/frameworks/5.54.0/syndication-5.54.0.tar.xz) = 159448
--- b/security/kf5-kdesu/distinfo	
+++ b/security/kf5-kdesu/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691285
-SHA256 (KDE/frameworks/5.53.0/kdesu-5.53.0.tar.xz) = be0bc2d77e38cc9c13e24daa66543c06a735343207542ab3f294be927c0a6da2
-SIZE (KDE/frameworks/5.53.0/kdesu-5.53.0.tar.xz) = 44756
+TIMESTAMP = 1546843259
+SHA256 (KDE/frameworks/5.54.0/kdesu-5.54.0.tar.xz) = 59d1d057f380c4efab9047815be1dc616c4ac528afb6b8a29fd92c812b0c1ce2
+SIZE (KDE/frameworks/5.54.0/kdesu-5.54.0.tar.xz) = 44744
--- b/sysutils/kf5-baloo/distinfo	
+++ b/sysutils/kf5-baloo/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691288
-SHA256 (KDE/frameworks/5.53.0/baloo-5.53.0.tar.xz) = e805f6f97ba9bc9a396653ae14bcdcf80502a5508d6f130b8f4ca9fcdee97dcb
-SIZE (KDE/frameworks/5.53.0/baloo-5.53.0.tar.xz) = 235088
+TIMESTAMP = 1546843260
+SHA256 (KDE/frameworks/5.54.0/baloo-5.54.0.tar.xz) = 2cbcab6a667093b049c4fed36eda5d904fd127cf43a49b763a22d33b40fc6873
+SIZE (KDE/frameworks/5.54.0/baloo-5.54.0.tar.xz) = 236752
--- b/sysutils/kf5-baloo/pkg-plist	
+++ b/sysutils/kf5-baloo/pkg-plist	
@@ -486,6 +486,8 @@ share/locale/zh_CN/LC_MESSAGES/kio5_timeline.mo
 share/locale/zh_TW/LC_MESSAGES/baloo_file5.mo
 share/locale/zh_TW/LC_MESSAGES/baloo_file_extractor5.mo
 share/locale/zh_TW/LC_MESSAGES/balooctl5.mo
+share/locale/zh_TW/LC_MESSAGES/baloodb5.mo
+share/locale/zh_TW/LC_MESSAGES/balooengine5.mo
 share/locale/zh_TW/LC_MESSAGES/baloomonitorplugin.mo
 share/locale/zh_TW/LC_MESSAGES/baloosearch5.mo
 share/locale/zh_TW/LC_MESSAGES/balooshow5.mo
--- b/sysutils/kf5-kwallet/Makefile	
+++ b/sysutils/kf5-kwallet/Makefile	
@@ -2,7 +2,6 @@ 
 
 PORTNAME=	kwallet
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
--- b/sysutils/kf5-kwallet/distinfo	
+++ b/sysutils/kf5-kwallet/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691289
-SHA256 (KDE/frameworks/5.53.0/kwallet-5.53.0.tar.xz) = 80f1d9dd7157147f4371e966f1d01772a7912914ba994f90593382fe4561bb8c
-SIZE (KDE/frameworks/5.53.0/kwallet-5.53.0.tar.xz) = 307664
+TIMESTAMP = 1546843260
+SHA256 (KDE/frameworks/5.54.0/kwallet-5.54.0.tar.xz) = 62223ca3bbca12da8a06ea1b7827ba9aeb97b75cf8a23ec8944dbc93d4bcd143
+SIZE (KDE/frameworks/5.54.0/kwallet-5.54.0.tar.xz) = 307696
--- b/textproc/kf5-kcodecs/distinfo	
+++ b/textproc/kf5-kcodecs/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691289
-SHA256 (KDE/frameworks/5.53.0/kcodecs-5.53.0.tar.xz) = 7a939fbe83df5911103c12f94cc0039ee97f6e8e1b655378debb05ce26a6b172
-SIZE (KDE/frameworks/5.53.0/kcodecs-5.53.0.tar.xz) = 219976
+TIMESTAMP = 1546843260
+SHA256 (KDE/frameworks/5.54.0/kcodecs-5.54.0.tar.xz) = 4c4f59936999c824273b030ef4d0dc9faef5c3e26dbbbb1427232e7750f013e8
+SIZE (KDE/frameworks/5.54.0/kcodecs-5.54.0.tar.xz) = 220128
--- b/textproc/kf5-sonnet/distinfo	
+++ b/textproc/kf5-sonnet/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691289
-SHA256 (KDE/frameworks/5.53.0/sonnet-5.53.0.tar.xz) = 286c4c377ab38f3c14ff807f7a471f803c691b1fb624cecee8e7c9df349b684a
-SIZE (KDE/frameworks/5.53.0/sonnet-5.53.0.tar.xz) = 285516
+TIMESTAMP = 1546843260
+SHA256 (KDE/frameworks/5.54.0/sonnet-5.54.0.tar.xz) = 9fb2780d370997817e2092d46b8a2ab0490992cf504e97bb6ab6fdebd7039f31
+SIZE (KDE/frameworks/5.54.0/sonnet-5.54.0.tar.xz) = 286720
--- b/textproc/kf5-syntax-highlighting/distinfo	
+++ b/textproc/kf5-syntax-highlighting/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691289
-SHA256 (KDE/frameworks/5.53.0/syntax-highlighting-5.53.0.tar.xz) = aa31517936a6c19080c2a62519d7eecd4c369a881614f841028b5d82ac0225ab
-SIZE (KDE/frameworks/5.53.0/syntax-highlighting-5.53.0.tar.xz) = 1319284
+TIMESTAMP = 1546843260
+SHA256 (KDE/frameworks/5.54.0/syntax-highlighting-5.54.0.tar.xz) = 1496e8a8ea264b21ee5bd89d3c04a6c6ff26ea50c3de222cc3a810f6d6bc5508
+SIZE (KDE/frameworks/5.54.0/syntax-highlighting-5.54.0.tar.xz) = 1354320
--- b/www/kf5-kdewebkit/distinfo	
+++ b/www/kf5-kdewebkit/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691290
-SHA256 (KDE/frameworks/5.53.0/kdewebkit-5.53.0.tar.xz) = c27905942807c418ff7d7a231f55137fbbd0b551391023e9dc6232936941abf4
-SIZE (KDE/frameworks/5.53.0/kdewebkit-5.53.0.tar.xz) = 29304
+TIMESTAMP = 1546843261
+SHA256 (KDE/frameworks/5.54.0/kdewebkit-5.54.0.tar.xz) = 0e5a09c820c4c53f68a3ba882b78389052809fc768bbf3203edb2215ca49345f
+SIZE (KDE/frameworks/5.54.0/kdewebkit-5.54.0.tar.xz) = 29312
--- b/www/kf5-khtml/distinfo	
+++ b/www/kf5-khtml/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691290
-SHA256 (KDE/frameworks/5.53.0/khtml-5.53.0.tar.xz) = de85b04cd71357ced676c2e15643c8a65cc29b3eef5983c3308b7c9126be951d
-SIZE (KDE/frameworks/5.53.0/khtml-5.53.0.tar.xz) = 2077000
+TIMESTAMP = 1546843261
+SHA256 (KDE/frameworks/5.54.0/khtml-5.54.0.tar.xz) = aa1d6671009e05a9538731db8ddb51c9fa540cebb0c5f90aebf6c04b6a64a89d
+SIZE (KDE/frameworks/5.54.0/khtml-5.54.0.tar.xz) = 2077240
--- b/www/kf5-kjs/distinfo	
+++ b/www/kf5-kjs/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691290
-SHA256 (KDE/frameworks/5.53.0/kjs-5.53.0.tar.xz) = 89111e457c06af13f3c904eca4458e6cb8e4bab051ae29504c02b5ea7c3f2cca
-SIZE (KDE/frameworks/5.53.0/kjs-5.53.0.tar.xz) = 294908
+TIMESTAMP = 1546843261
+SHA256 (KDE/frameworks/5.54.0/kjs-5.54.0.tar.xz) = 9e71a6613dee056cdf3d584a431203e5eafaf620d4f0dc40e57ce5c5d75e2d2e
+SIZE (KDE/frameworks/5.54.0/kjs-5.54.0.tar.xz) = 294940
--- b/www/kf5-kjsembed/distinfo	
+++ b/www/kf5-kjsembed/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691291
-SHA256 (KDE/frameworks/5.53.0/kjsembed-5.53.0.tar.xz) = d90c68121cc90e7eba276a74acefb72f4f197719c485d95fe23a418e8ffd7248
-SIZE (KDE/frameworks/5.53.0/kjsembed-5.53.0.tar.xz) = 169456
+TIMESTAMP = 1546843261
+SHA256 (KDE/frameworks/5.54.0/kjsembed-5.54.0.tar.xz) = e88763145ed0b9ffd4a9215bb7e08108a2e332073125ec6c4407daac3d9a57de
+SIZE (KDE/frameworks/5.54.0/kjsembed-5.54.0.tar.xz) = 169436
--- b/x11-themes/kf5-breeze-icons/distinfo	
+++ b/x11-themes/kf5-breeze-icons/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691291
-SHA256 (KDE/frameworks/5.53.0/breeze-icons-5.53.0.tar.xz) = aeb1c147102959838427a47ebbcae07e33779b64dbede66fe143db5c419e2298
-SIZE (KDE/frameworks/5.53.0/breeze-icons-5.53.0.tar.xz) = 1555744
+TIMESTAMP = 1546843261
+SHA256 (KDE/frameworks/5.54.0/breeze-icons-5.54.0.tar.xz) = 5e160b1c2eb82a55a10e65eba14fcd01da6db14471213df268abe028debdadbc
+SIZE (KDE/frameworks/5.54.0/breeze-icons-5.54.0.tar.xz) = 1591224
--- b/x11-themes/kf5-breeze-icons/pkg-plist	
+++ b/x11-themes/kf5-breeze-icons/pkg-plist	
@@ -454,6 +454,8 @@ share/icons/breeze-dark/actions/16/flag-red.svg
 share/icons/breeze-dark/actions/16/flag-yellow.svg
 share/icons/breeze-dark/actions/16/flag.svg
 share/icons/breeze-dark/actions/16/flash.svg
+share/icons/breeze-dark/actions/16/flashlight-off.svg
+share/icons/breeze-dark/actions/16/flashlight-on.svg
 share/icons/breeze-dark/actions/16/folder-new.svg
 share/icons/breeze-dark/actions/16/folder-stash.svg
 share/icons/breeze-dark/actions/16/folder-sync.svg
@@ -1472,6 +1474,7 @@ share/icons/breeze-dark/actions/16/view-pim-tasks-pending.svg
 share/icons/breeze-dark/actions/16/view-pim-tasks.svg
 share/icons/breeze-dark/actions/16/view-presentation.svg
 share/icons/breeze-dark/actions/16/view-preview.svg
+share/icons/breeze-dark/actions/16/view-private.svg
 share/icons/breeze-dark/actions/16/view-process-all-tree.svg
 share/icons/breeze-dark/actions/16/view-process-all.svg
 share/icons/breeze-dark/actions/16/view-process-own.svg
@@ -2033,6 +2036,8 @@ share/icons/breeze-dark/actions/22/flag-red.svg
 share/icons/breeze-dark/actions/22/flag-yellow.svg
 share/icons/breeze-dark/actions/22/flag.svg
 share/icons/breeze-dark/actions/22/flash.svg
+share/icons/breeze-dark/actions/22/flashlight-off.svg
+share/icons/breeze-dark/actions/22/flashlight-on.svg
 share/icons/breeze-dark/actions/22/flower-shape.svg
 share/icons/breeze-dark/actions/22/folder-new.svg
 share/icons/breeze-dark/actions/22/folder-stash.svg
@@ -3544,6 +3549,8 @@ share/icons/breeze-dark/actions/24/flag-green.svg
 share/icons/breeze-dark/actions/24/flag-red.svg
 share/icons/breeze-dark/actions/24/flag-yellow.svg
 share/icons/breeze-dark/actions/24/flag.svg
+share/icons/breeze-dark/actions/24/flashlight-off.svg
+share/icons/breeze-dark/actions/24/flashlight-on.svg
 share/icons/breeze-dark/actions/24/folder-new.svg
 share/icons/breeze-dark/actions/24/folder-sync.svg
 share/icons/breeze-dark/actions/24/fork.svg
@@ -4365,6 +4372,8 @@ share/icons/breeze-dark/actions/32/editor.svg
 share/icons/breeze-dark/actions/32/file-zoom-in.svg
 share/icons/breeze-dark/actions/32/file-zoom-out.svg
 share/icons/breeze-dark/actions/32/flash.svg
+share/icons/breeze-dark/actions/32/flashlight-off.svg
+share/icons/breeze-dark/actions/32/flashlight-on.svg
 share/icons/breeze-dark/actions/32/folder-new.svg
 share/icons/breeze-dark/actions/32/folder-sync.svg
 share/icons/breeze-dark/actions/32/format-stroke-color.svg
@@ -4694,6 +4703,7 @@ share/icons/breeze-dark/actions/symbolic/view-list-symbolic.svg
 share/icons/breeze-dark/actions/symbolic/view-more-horizontal-symbolic.svg
 share/icons/breeze-dark/actions/symbolic/view-more-symbolic.svg
 share/icons/breeze-dark/actions/symbolic/view-presentation-symbolic.svg
+share/icons/breeze-dark/actions/symbolic/view-private-symbolic.svg
 share/icons/breeze-dark/actions/symbolic/view-refresh-symbolic.svg
 share/icons/breeze-dark/actions/symbolic/view-restore-symbolic.svg
 share/icons/breeze-dark/actions/symbolic/view-sort-ascending-symbolic.svg
@@ -4898,13 +4908,19 @@ share/icons/breeze-dark/apps/22/vlc.svg
 share/icons/breeze-dark/apps/22@2x
 share/icons/breeze-dark/apps/32/accessories-text-editor.svg
 share/icons/breeze-dark/apps/32/hotspot.svg
+share/icons/breeze-dark/apps/32/hwinfo.svg
 share/icons/breeze-dark/apps/32/kate.svg
 share/icons/breeze-dark/apps/32/kwrite.svg
 share/icons/breeze-dark/apps/32/plasmavault.svg
 share/icons/breeze-dark/apps/32/system-file-manager.svg
+share/icons/breeze-dark/apps/32/system-help.svg
+share/icons/breeze-dark/apps/32/systemsettings.svg
 share/icons/breeze-dark/apps/32/umbrello.svg
+share/icons/breeze-dark/apps/32/utilities-log-viewer.svg
 share/icons/breeze-dark/apps/32/utilities-terminal.svg
 share/icons/breeze-dark/apps/32/vlc.svg
+share/icons/breeze-dark/apps/32/yast-sw_single.svg
+share/icons/breeze-dark/apps/32/yast.svg
 share/icons/breeze-dark/apps/48/CMakeSetup.svg
 share/icons/breeze-dark/apps/48/QOwnNotes.svg
 share/icons/breeze-dark/apps/48/QtProject-designer.svg
@@ -5225,6 +5241,9 @@ share/icons/breeze-dark/apps/48/xterm-color.svg
 share/icons/breeze-dark/apps/48/xterm.svg
 share/icons/breeze-dark/apps/48/yakuake.svg
 share/icons/breeze-dark/apps/48/yandex-browser.svg
+share/icons/breeze-dark/apps/48/yast-installation.svg
+share/icons/breeze-dark/apps/48/yast-sw_single.svg
+share/icons/breeze-dark/apps/48/yast.svg
 share/icons/breeze-dark/apps/64/accessories-text-editor.svg
 share/icons/breeze-dark/apps/64/diaspora.svg
 share/icons/breeze-dark/apps/64/hotspot.svg
@@ -5258,9 +5277,13 @@ share/icons/breeze-dark/devices/16/computer-laptop.svg
 share/icons/breeze-dark/devices/16/computer.svg
 share/icons/breeze-dark/devices/16/cups.svg
 share/icons/breeze-dark/devices/16/cupsprinter.svg
+share/icons/breeze-dark/devices/16/drive-harddisk-encrypted.svg
 share/icons/breeze-dark/devices/16/drive-harddisk-root.svg
 share/icons/breeze-dark/devices/16/drive-harddisk.svg
+share/icons/breeze-dark/devices/16/drive-multidisk.svg
+share/icons/breeze-dark/devices/16/drive-multipartition.svg
 share/icons/breeze-dark/devices/16/drive-optical.svg
+share/icons/breeze-dark/devices/16/drive-partition.svg
 share/icons/breeze-dark/devices/16/drive-removable-media-usb-pendrive.svg
 share/icons/breeze-dark/devices/16/drive-removable-media-usb.svg
 share/icons/breeze-dark/devices/16/drive-removable-media.svg
@@ -5276,6 +5299,8 @@ share/icons/breeze-dark/devices/16/multimedia-player-ipod-mini-blue.svg
 share/icons/breeze-dark/devices/16/multimedia-player.svg
 share/icons/breeze-dark/devices/16/network-bluetooth.svg
 share/icons/breeze-dark/devices/16/network-modem.svg
+share/icons/breeze-dark/devices/16/network-rj11-female.svg
+share/icons/breeze-dark/devices/16/network-rj45-female.svg
 share/icons/breeze-dark/devices/16/network-vpn.svg
 share/icons/breeze-dark/devices/16/network-wired-activated.svg
 share/icons/breeze-dark/devices/16/network-wired-unavailable.svg
@@ -5302,9 +5327,13 @@ share/icons/breeze-dark/devices/22/computer-laptop.svg
 share/icons/breeze-dark/devices/22/computer.svg
 share/icons/breeze-dark/devices/22/cups.svg
 share/icons/breeze-dark/devices/22/cupsprinter.svg
+share/icons/breeze-dark/devices/22/drive-harddisk-encrypted.svg
 share/icons/breeze-dark/devices/22/drive-harddisk-root.svg
 share/icons/breeze-dark/devices/22/drive-harddisk.svg
+share/icons/breeze-dark/devices/22/drive-multidisk.svg
+share/icons/breeze-dark/devices/22/drive-multipartition.svg
 share/icons/breeze-dark/devices/22/drive-optical.svg
+share/icons/breeze-dark/devices/22/drive-partition.svg
 share/icons/breeze-dark/devices/22/drive-removable-media-usb-pendrive.svg
 share/icons/breeze-dark/devices/22/drive-removable-media-usb.svg
 share/icons/breeze-dark/devices/22/drive-removable-media.svg
@@ -5323,6 +5352,8 @@ share/icons/breeze-dark/devices/22/media-optical.svg
 share/icons/breeze-dark/devices/22/multimedia-player-ipod-mini-blue.svg
 share/icons/breeze-dark/devices/22/network-bluetooth.svg
 share/icons/breeze-dark/devices/22/network-modem.svg
+share/icons/breeze-dark/devices/22/network-rj11-female.svg
+share/icons/breeze-dark/devices/22/network-rj45-female.svg
 share/icons/breeze-dark/devices/22/network-vpn.svg
 share/icons/breeze-dark/devices/22/network-wired-activated.svg
 share/icons/breeze-dark/devices/22/network-wired-unavailable.svg
@@ -5350,9 +5381,13 @@ share/icons/breeze-dark/devices/64/computer.svg
 share/icons/breeze-dark/devices/64/cpu.svg
 share/icons/breeze-dark/devices/64/cups.svg
 share/icons/breeze-dark/devices/64/cupsprinter.svg
+share/icons/breeze-dark/devices/64/drive-harddisk-encrypted.svg
 share/icons/breeze-dark/devices/64/drive-harddisk-root.svg
 share/icons/breeze-dark/devices/64/drive-harddisk.svg
+share/icons/breeze-dark/devices/64/drive-multidisk.svg
+share/icons/breeze-dark/devices/64/drive-multipartition.svg
 share/icons/breeze-dark/devices/64/drive-optical.svg
+share/icons/breeze-dark/devices/64/drive-partition.svg
 share/icons/breeze-dark/devices/64/drive-removable-media-usb-pendrive.svg
 share/icons/breeze-dark/devices/64/drive-removable-media-usb.svg
 share/icons/breeze-dark/devices/64/drive-removable-media.svg
@@ -5374,6 +5409,8 @@ share/icons/breeze-dark/devices/64/media-optical-video.svg
 share/icons/breeze-dark/devices/64/media-optical.svg
 share/icons/breeze-dark/devices/64/multimedia-player.svg
 share/icons/breeze-dark/devices/64/network-card.svg
+share/icons/breeze-dark/devices/64/network-rj11-female.svg
+share/icons/breeze-dark/devices/64/network-rj45-female.svg
 share/icons/breeze-dark/devices/64/phone.svg
 share/icons/breeze-dark/devices/64/printer.svg
 share/icons/breeze-dark/devices/64/scanner.svg
@@ -5385,11 +5422,15 @@ share/icons/breeze-dark/devices/symbolic/audio-speakers-symbolic.svg
 share/icons/breeze-dark/devices/symbolic/camera-photo-symbolic.svg
 share/icons/breeze-dark/devices/symbolic/camera-web-symbolic.svg
 share/icons/breeze-dark/devices/symbolic/computer-symbolic.svg
+share/icons/breeze-dark/devices/symbolic/drive-harddisk-encrypted-symbolic.svg
 share/icons/breeze-dark/devices/symbolic/drive-harddisk-ieee1394-symbolic.svg
 share/icons/breeze-dark/devices/symbolic/drive-harddisk-root-symbolic.svg
 share/icons/breeze-dark/devices/symbolic/drive-harddisk-symbolic.svg
 share/icons/breeze-dark/devices/symbolic/drive-harddisk-system-symbolic.svg
 share/icons/breeze-dark/devices/symbolic/drive-harddisk-usb-symbolic.svg
+share/icons/breeze-dark/devices/symbolic/drive-multidisk-symbolic.svg
+share/icons/breeze-dark/devices/symbolic/drive-multipartition-symbolic.svg
+share/icons/breeze-dark/devices/symbolic/drive-partition-symbolic.svg
 share/icons/breeze-dark/devices/symbolic/drive-removable-media-symbolic.svg
 share/icons/breeze-dark/devices/symbolic/input-tablet-symbolic.svg
 share/icons/breeze-dark/devices/symbolic/media-flash-symbolic.svg
@@ -5643,6 +5684,7 @@ share/icons/breeze-dark/mimetypes/16/application-vnd.openxmlformats-officedocume
 share/icons/breeze-dark/mimetypes/16/application-vnd.rar.svg
 share/icons/breeze-dark/mimetypes/16/application-vnd.rn-realmedia.svg
 share/icons/breeze-dark/mimetypes/16/application-vnd.scribus.svg
+share/icons/breeze-dark/mimetypes/16/application-vnd.sqlite3.svg
 share/icons/breeze-dark/mimetypes/16/application-vnd.stardivision.calc.svg
 share/icons/breeze-dark/mimetypes/16/application-vnd.stardivision.draw.svg
 share/icons/breeze-dark/mimetypes/16/application-vnd.stardivision.mail.svg
@@ -5963,6 +6005,7 @@ share/icons/breeze-dark/mimetypes/16/text-x-patch.svg
 share/icons/breeze-dark/mimetypes/16/text-x-plain.svg
 share/icons/breeze-dark/mimetypes/16/text-x-po.svg
 share/icons/breeze-dark/mimetypes/16/text-x-python.svg
+share/icons/breeze-dark/mimetypes/16/text-x-python3.svg
 share/icons/breeze-dark/mimetypes/16/text-x-qml.svg
 share/icons/breeze-dark/mimetypes/16/text-x-r.svg
 share/icons/breeze-dark/mimetypes/16/text-x-readme.svg
@@ -6103,6 +6146,7 @@ share/icons/breeze-dark/mimetypes/22/application-vnd.openxmlformats-officedocume
 share/icons/breeze-dark/mimetypes/22/application-vnd.rar.svg
 share/icons/breeze-dark/mimetypes/22/application-vnd.rn-realmedia.svg
 share/icons/breeze-dark/mimetypes/22/application-vnd.scribus.svg
+share/icons/breeze-dark/mimetypes/22/application-vnd.sqlite3.svg
 share/icons/breeze-dark/mimetypes/22/application-vnd.stardivision.calc.svg
 share/icons/breeze-dark/mimetypes/22/application-vnd.stardivision.draw.svg
 share/icons/breeze-dark/mimetypes/22/application-vnd.stardivision.mail.svg
@@ -6422,6 +6466,7 @@ share/icons/breeze-dark/mimetypes/22/text-x-patch.svg
 share/icons/breeze-dark/mimetypes/22/text-x-plain.svg
 share/icons/breeze-dark/mimetypes/22/text-x-po.svg
 share/icons/breeze-dark/mimetypes/22/text-x-python.svg
+share/icons/breeze-dark/mimetypes/22/text-x-python3.svg
 share/icons/breeze-dark/mimetypes/22/text-x-qml.svg
 share/icons/breeze-dark/mimetypes/22/text-x-r.svg
 share/icons/breeze-dark/mimetypes/22/text-x-readme.svg
@@ -6562,6 +6607,7 @@ share/icons/breeze-dark/mimetypes/32/application-vnd.openxmlformats-officedocume
 share/icons/breeze-dark/mimetypes/32/application-vnd.rar.svg
 share/icons/breeze-dark/mimetypes/32/application-vnd.rn-realmedia.svg
 share/icons/breeze-dark/mimetypes/32/application-vnd.scribus.svg
+share/icons/breeze-dark/mimetypes/32/application-vnd.sqlite3.svg
 share/icons/breeze-dark/mimetypes/32/application-vnd.stardivision.calc.svg
 share/icons/breeze-dark/mimetypes/32/application-vnd.stardivision.draw.svg
 share/icons/breeze-dark/mimetypes/32/application-vnd.stardivision.mail.svg
@@ -6881,6 +6927,7 @@ share/icons/breeze-dark/mimetypes/32/text-x-patch.svg
 share/icons/breeze-dark/mimetypes/32/text-x-plain.svg
 share/icons/breeze-dark/mimetypes/32/text-x-po.svg
 share/icons/breeze-dark/mimetypes/32/text-x-python.svg
+share/icons/breeze-dark/mimetypes/32/text-x-python3.svg
 share/icons/breeze-dark/mimetypes/32/text-x-qml.svg
 share/icons/breeze-dark/mimetypes/32/text-x-r.svg
 share/icons/breeze-dark/mimetypes/32/text-x-readme.svg
@@ -7020,6 +7067,7 @@ share/icons/breeze-dark/mimetypes/64/application-vnd.openxmlformats-officedocume
 share/icons/breeze-dark/mimetypes/64/application-vnd.rar.svg
 share/icons/breeze-dark/mimetypes/64/application-vnd.rn-realmedia.svg
 share/icons/breeze-dark/mimetypes/64/application-vnd.scribus.svg
+share/icons/breeze-dark/mimetypes/64/application-vnd.sqlite3.svg
 share/icons/breeze-dark/mimetypes/64/application-vnd.stardivision.calc.svg
 share/icons/breeze-dark/mimetypes/64/application-vnd.stardivision.draw.svg
 share/icons/breeze-dark/mimetypes/64/application-vnd.stardivision.mail.svg
@@ -7339,6 +7387,7 @@ share/icons/breeze-dark/mimetypes/64/text-x-patch.svg
 share/icons/breeze-dark/mimetypes/64/text-x-plain.svg
 share/icons/breeze-dark/mimetypes/64/text-x-po.svg
 share/icons/breeze-dark/mimetypes/64/text-x-python.svg
+share/icons/breeze-dark/mimetypes/64/text-x-python3.svg
 share/icons/breeze-dark/mimetypes/64/text-x-qml.svg
 share/icons/breeze-dark/mimetypes/64/text-x-r.svg
 share/icons/breeze-dark/mimetypes/64/text-x-readme.svg
@@ -7757,20 +7806,67 @@ share/icons/breeze-dark/preferences/32/preferences-desktop-user-password.svg
 share/icons/breeze-dark/preferences/32/preferences-desktop-user.svg
 share/icons/breeze-dark/preferences/32/preferences-desktop-wallpaper.svg
 share/icons/breeze-dark/preferences/32/preferences-desktop.svg
+share/icons/breeze-dark/preferences/32/preferences-devices-cpu.svg
+share/icons/breeze-dark/preferences/32/preferences-devices-drive-optical-check.svg
+share/icons/breeze-dark/preferences/32/preferences-devices-printer.svg
+share/icons/breeze-dark/preferences/32/preferences-devices-scanner.svg
+share/icons/breeze-dark/preferences/32/preferences-devices-tree.svg
 share/icons/breeze-dark/preferences/32/preferences-gtk-config.svg
 share/icons/breeze-dark/preferences/32/preferences-kde-connect.svg
+share/icons/breeze-dark/preferences/32/preferences-log.svg
 share/icons/breeze-dark/preferences/32/preferences-other.svg
 share/icons/breeze-dark/preferences/32/preferences-plugin.svg
+share/icons/breeze-dark/preferences/32/preferences-%%CMAKE_BUILD_TYPE%%notes.svg
+share/icons/breeze-dark/preferences/32/preferences-security-apparmor.svg
+share/icons/breeze-dark/preferences/32/preferences-security-firewall.svg
+share/icons/breeze-dark/preferences/32/preferences-security-kerberos.svg
+share/icons/breeze-dark/preferences/32/preferences-security.svg
+share/icons/breeze-dark/preferences/32/preferences-system-backup.svg
 share/icons/breeze-dark/preferences/32/preferences-system-bluetooth.svg
+share/icons/breeze-dark/preferences/32/preferences-system-linux.svg
 share/icons/breeze-dark/preferences/32/preferences-system-login.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-dsl.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-ethernet.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-iscsi.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-ldap.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-nis.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-ntp.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-proxy.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-remote.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-samba.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-boot.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-dhcp.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-dns.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-ftp.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-installation.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-iscsi.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-kerberos.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-ldap.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-mail.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-nfs.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-nis.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-samba.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-slp.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server-web.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-server.svg
 share/icons/breeze-dark/preferences/32/preferences-system-network-sharing.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-vpn.svg
+share/icons/breeze-dark/preferences/32/preferences-system-network-wakeonlan.svg
 share/icons/breeze-dark/preferences/32/preferences-system-network.svg
 share/icons/breeze-dark/preferences/32/preferences-system-power-management.svg
+share/icons/breeze-dark/preferences/32/preferences-system-services.svg
 share/icons/breeze-dark/preferences/32/preferences-system-session-services.svg
+share/icons/breeze-dark/preferences/32/preferences-system-startup.svg
 share/icons/breeze-dark/preferences/32/preferences-system-time.svg
+share/icons/breeze-dark/preferences/32/preferences-system-user-sudo.svg
 share/icons/breeze-dark/preferences/32/preferences-system-windows-actions.svg
 share/icons/breeze-dark/preferences/32/preferences-system-windows-move.svg
 share/icons/breeze-dark/preferences/32/preferences-system-windows.svg
+share/icons/breeze-dark/preferences/32/preferences-virtualization-container.svg
+share/icons/breeze-dark/preferences/32/preferences-virtualization-vm-install.svg
+share/icons/breeze-dark/preferences/32/preferences-virtualization-vm-migrate.svg
+share/icons/breeze-dark/preferences/32/preferences-virtualization-vm-new.svg
+share/icons/breeze-dark/preferences/32/preferences-virtualization-vm.svg
 share/icons/breeze-dark/preferences/32/preferences-web-browser-adblock.svg
 share/icons/breeze-dark/preferences/32/preferences-web-browser-cache.svg
 share/icons/breeze-dark/preferences/32/preferences-web-browser-cookies.svg
@@ -7778,9 +7874,79 @@ share/icons/breeze-dark/preferences/32/preferences-web-browser-identification.sv
 share/icons/breeze-dark/preferences/32/preferences-web-browser-shortcuts.svg
 share/icons/breeze-dark/preferences/32/preferences-web-browser-ssl.svg
 share/icons/breeze-dark/preferences/32/preferences-web-browser-stylesheets.svg
+share/icons/breeze-dark/preferences/32/preferences.svg
 share/icons/breeze-dark/preferences/32/system-lock-screen.svg
 share/icons/breeze-dark/preferences/32/system-users.svg
 share/icons/breeze-dark/preferences/32/window-duplicate.svg
+share/icons/breeze-dark/preferences/32/yast-addon.svg
+share/icons/breeze-dark/preferences/32/yast-alternatives.svg
+share/icons/breeze-dark/preferences/32/yast-apparmor.svg
+share/icons/breeze-dark/preferences/32/yast-auth-client.svg
+share/icons/breeze-dark/preferences/32/yast-autoyast.svg
+share/icons/breeze-dark/preferences/32/yast-bootloader.svg
+share/icons/breeze-dark/preferences/32/yast-checkmedia.svg
+share/icons/breeze-dark/preferences/32/yast-create-new-vm.svg
+share/icons/breeze-dark/preferences/32/yast-device-tree.svg
+share/icons/breeze-dark/preferences/32/yast-dhcp-server.svg
+share/icons/breeze-dark/preferences/32/yast-disk.svg
+share/icons/breeze-dark/preferences/32/yast-dns-server.svg
+share/icons/breeze-dark/preferences/32/yast-docker.svg
+share/icons/breeze-dark/preferences/32/yast-dsl.svg
+share/icons/breeze-dark/preferences/32/yast-fcoe.svg
+share/icons/breeze-dark/preferences/32/yast-firewall.svg
+share/icons/breeze-dark/preferences/32/yast-fonts.svg
+share/icons/breeze-dark/preferences/32/yast-ftp-server.svg
+share/icons/breeze-dark/preferences/32/yast-hardware.svg
+share/icons/breeze-dark/preferences/32/yast-host.svg
+share/icons/breeze-dark/preferences/32/yast-http-server.svg
+share/icons/breeze-dark/preferences/32/yast-hwinfo.svg
+share/icons/breeze-dark/preferences/32/yast-instserver.svg
+share/icons/breeze-dark/preferences/32/yast-iscsi-client.svg
+share/icons/breeze-dark/preferences/32/yast-iscsi-server.svg
+share/icons/breeze-dark/preferences/32/yast-journal.svg
+share/icons/breeze-dark/preferences/32/yast-kerberos-server.svg
+share/icons/breeze-dark/preferences/32/yast-kernel.svg
+share/icons/breeze-dark/preferences/32/yast-keyboard.svg
+share/icons/breeze-dark/preferences/32/yast-lan.svg
+share/icons/breeze-dark/preferences/32/yast-language.svg
+share/icons/breeze-dark/preferences/32/yast-ldap-server.svg
+share/icons/breeze-dark/preferences/32/yast-ldap.svg
+share/icons/breeze-dark/preferences/32/yast-mail.svg
+share/icons/breeze-dark/preferences/32/yast-messages.svg
+share/icons/breeze-dark/preferences/32/yast-misc.svg
+share/icons/breeze-dark/preferences/32/yast-network.svg
+share/icons/breeze-dark/preferences/32/yast-nfs-server.svg
+share/icons/breeze-dark/preferences/32/yast-nfs.svg
+share/icons/breeze-dark/preferences/32/yast-nis-server.svg
+share/icons/breeze-dark/preferences/32/yast-nis.svg
+share/icons/breeze-dark/preferences/32/yast-ntp-client.svg
+share/icons/breeze-dark/preferences/32/yast-printer.svg
+share/icons/breeze-dark/preferences/32/yast-proxy.svg
+share/icons/breeze-dark/preferences/32/yast-%%CMAKE_BUILD_TYPE%%-notes.svg
+share/icons/breeze-dark/preferences/32/yast-remote.svg
+share/icons/breeze-dark/preferences/32/yast-samba-client.svg
+share/icons/breeze-dark/preferences/32/yast-samba-server.svg
+share/icons/breeze-dark/preferences/32/yast-scanner.svg
+share/icons/breeze-dark/preferences/32/yast-security.svg
+share/icons/breeze-dark/preferences/32/yast-services-manager.svg
+share/icons/breeze-dark/preferences/32/yast-slp-server.svg
+share/icons/breeze-dark/preferences/32/yast-snapper.svg
+share/icons/breeze-dark/preferences/32/yast-software.svg
+share/icons/breeze-dark/preferences/32/yast-sound.svg
+share/icons/breeze-dark/preferences/32/yast-sudo.svg
+share/icons/breeze-dark/preferences/32/yast-support.svg
+share/icons/breeze-dark/preferences/32/yast-sw_source.svg
+share/icons/breeze-dark/preferences/32/yast-sysconfig.svg
+share/icons/breeze-dark/preferences/32/yast-system.svg
+share/icons/breeze-dark/preferences/32/yast-tftp-server.svg
+share/icons/breeze-dark/preferences/32/yast-timezone.svg
+share/icons/breeze-dark/preferences/32/yast-update.svg
+share/icons/breeze-dark/preferences/32/yast-users.svg
+share/icons/breeze-dark/preferences/32/yast-vm-install.svg
+share/icons/breeze-dark/preferences/32/yast-vm-migrate.svg
+share/icons/breeze-dark/preferences/32/yast-vm.svg
+share/icons/breeze-dark/preferences/32/yast-vpn.svg
+share/icons/breeze-dark/preferences/32/yast-wol.svg
 share/icons/breeze-dark/status/16/audio-off.svg
 share/icons/breeze-dark/status/16/audio-on.svg
 share/icons/breeze-dark/status/16/audio-ready.svg
@@ -7839,6 +8005,9 @@ share/icons/breeze-dark/status/16/user-invisible.svg
 share/icons/breeze-dark/status/16/user-offline.svg
 share/icons/breeze-dark/status/16/user-online.svg
 share/icons/breeze-dark/status/16@2x
+share/icons/breeze-dark/status/22/audio-off.svg
+share/icons/breeze-dark/status/22/audio-on.svg
+share/icons/breeze-dark/status/22/audio-ready.svg
 share/icons/breeze-dark/status/22/audio-volume-high.svg
 share/icons/breeze-dark/status/22/audio-volume-low.svg
 share/icons/breeze-dark/status/22/audio-volume-medium.svg
@@ -8465,6 +8634,8 @@ share/icons/breeze/actions/16/flag-red.svg
 share/icons/breeze/actions/16/flag-yellow.svg
 share/icons/breeze/actions/16/flag.svg
 share/icons/breeze/actions/16/flash.svg
+share/icons/breeze/actions/16/flashlight-off.svg
+share/icons/breeze/actions/16/flashlight-on.svg
 share/icons/breeze/actions/16/folder-new.svg
 share/icons/breeze/actions/16/folder-stash.svg
 share/icons/breeze/actions/16/folder-sync.svg
@@ -9483,6 +9654,7 @@ share/icons/breeze/actions/16/view-pim-tasks-pending.svg
 share/icons/breeze/actions/16/view-pim-tasks.svg
 share/icons/breeze/actions/16/view-presentation.svg
 share/icons/breeze/actions/16/view-preview.svg
+share/icons/breeze/actions/16/view-private.svg
 share/icons/breeze/actions/16/view-process-all-tree.svg
 share/icons/breeze/actions/16/view-process-all.svg
 share/icons/breeze/actions/16/view-process-own.svg
@@ -10044,6 +10216,8 @@ share/icons/breeze/actions/22/flag-red.svg
 share/icons/breeze/actions/22/flag-yellow.svg
 share/icons/breeze/actions/22/flag.svg
 share/icons/breeze/actions/22/flash.svg
+share/icons/breeze/actions/22/flashlight-off.svg
+share/icons/breeze/actions/22/flashlight-on.svg
 share/icons/breeze/actions/22/flower-shape.svg
 share/icons/breeze/actions/22/folder-new.svg
 share/icons/breeze/actions/22/folder-stash.svg
@@ -11555,6 +11729,8 @@ share/icons/breeze/actions/24/flag-green.svg
 share/icons/breeze/actions/24/flag-red.svg
 share/icons/breeze/actions/24/flag-yellow.svg
 share/icons/breeze/actions/24/flag.svg
+share/icons/breeze/actions/24/flashlight-off.svg
+share/icons/breeze/actions/24/flashlight-on.svg
 share/icons/breeze/actions/24/folder-new.svg
 share/icons/breeze/actions/24/folder-sync.svg
 share/icons/breeze/actions/24/fork.svg
@@ -12376,6 +12552,8 @@ share/icons/breeze/actions/32/editor.svg
 share/icons/breeze/actions/32/file-zoom-in.svg
 share/icons/breeze/actions/32/file-zoom-out.svg
 share/icons/breeze/actions/32/flash.svg
+share/icons/breeze/actions/32/flashlight-off.svg
+share/icons/breeze/actions/32/flashlight-on.svg
 share/icons/breeze/actions/32/folder-new.svg
 share/icons/breeze/actions/32/folder-sync.svg
 share/icons/breeze/actions/32/format-stroke-color.svg
@@ -12705,6 +12883,7 @@ share/icons/breeze/actions/symbolic/view-list-symbolic.svg
 share/icons/breeze/actions/symbolic/view-more-horizontal-symbolic.svg
 share/icons/breeze/actions/symbolic/view-more-symbolic.svg
 share/icons/breeze/actions/symbolic/view-presentation-symbolic.svg
+share/icons/breeze/actions/symbolic/view-private-symbolic.svg
 share/icons/breeze/actions/symbolic/view-refresh-symbolic.svg
 share/icons/breeze/actions/symbolic/view-restore-symbolic.svg
 share/icons/breeze/actions/symbolic/view-sort-ascending-symbolic.svg
@@ -12911,13 +13090,19 @@ share/icons/breeze/apps/22/vlc.svg
 share/icons/breeze/apps/22@2x
 share/icons/breeze/apps/32/accessories-text-editor.svg
 share/icons/breeze/apps/32/hotspot.svg
+share/icons/breeze/apps/32/hwinfo.svg
 share/icons/breeze/apps/32/kate.svg
 share/icons/breeze/apps/32/kwrite.svg
 share/icons/breeze/apps/32/plasmavault.svg
 share/icons/breeze/apps/32/system-file-manager.svg
+share/icons/breeze/apps/32/system-help.svg
+share/icons/breeze/apps/32/systemsettings.svg
 share/icons/breeze/apps/32/umbrello.svg
+share/icons/breeze/apps/32/utilities-log-viewer.svg
 share/icons/breeze/apps/32/utilities-terminal.svg
 share/icons/breeze/apps/32/vlc.svg
+share/icons/breeze/apps/32/yast-sw_single.svg
+share/icons/breeze/apps/32/yast.svg
 share/icons/breeze/apps/48/CMakeSetup.svg
 share/icons/breeze/apps/48/QOwnNotes.svg
 share/icons/breeze/apps/48/QtProject-designer.svg
@@ -13238,6 +13423,9 @@ share/icons/breeze/apps/48/xterm-color.svg
 share/icons/breeze/apps/48/xterm.svg
 share/icons/breeze/apps/48/yakuake.svg
 share/icons/breeze/apps/48/yandex-browser.svg
+share/icons/breeze/apps/48/yast-installation.svg
+share/icons/breeze/apps/48/yast-sw_single.svg
+share/icons/breeze/apps/48/yast.svg
 share/icons/breeze/apps/64/accessories-text-editor.svg
 share/icons/breeze/apps/64/diaspora.svg
 share/icons/breeze/apps/64/hotspot.svg
@@ -13271,9 +13459,13 @@ share/icons/breeze/devices/16/computer-laptop.svg
 share/icons/breeze/devices/16/computer.svg
 share/icons/breeze/devices/16/cups.svg
 share/icons/breeze/devices/16/cupsprinter.svg
+share/icons/breeze/devices/16/drive-harddisk-encrypted.svg
 share/icons/breeze/devices/16/drive-harddisk-root.svg
 share/icons/breeze/devices/16/drive-harddisk.svg
+share/icons/breeze/devices/16/drive-multidisk.svg
+share/icons/breeze/devices/16/drive-multipartition.svg
 share/icons/breeze/devices/16/drive-optical.svg
+share/icons/breeze/devices/16/drive-partition.svg
 share/icons/breeze/devices/16/drive-removable-media-usb-pendrive.svg
 share/icons/breeze/devices/16/drive-removable-media-usb.svg
 share/icons/breeze/devices/16/drive-removable-media.svg
@@ -13289,6 +13481,8 @@ share/icons/breeze/devices/16/multimedia-player-ipod-mini-blue.svg
 share/icons/breeze/devices/16/multimedia-player.svg
 share/icons/breeze/devices/16/network-bluetooth.svg
 share/icons/breeze/devices/16/network-modem.svg
+share/icons/breeze/devices/16/network-rj11-female.svg
+share/icons/breeze/devices/16/network-rj45-female.svg
 share/icons/breeze/devices/16/network-vpn.svg
 share/icons/breeze/devices/16/network-wired-activated.svg
 share/icons/breeze/devices/16/network-wired-unavailable.svg
@@ -13315,9 +13509,13 @@ share/icons/breeze/devices/22/computer-laptop.svg
 share/icons/breeze/devices/22/computer.svg
 share/icons/breeze/devices/22/cups.svg
 share/icons/breeze/devices/22/cupsprinter.svg
+share/icons/breeze/devices/22/drive-harddisk-encrypted.svg
 share/icons/breeze/devices/22/drive-harddisk-root.svg
 share/icons/breeze/devices/22/drive-harddisk.svg
+share/icons/breeze/devices/22/drive-multidisk.svg
+share/icons/breeze/devices/22/drive-multipartition.svg
 share/icons/breeze/devices/22/drive-optical.svg
+share/icons/breeze/devices/22/drive-partition.svg
 share/icons/breeze/devices/22/drive-removable-media-usb-pendrive.svg
 share/icons/breeze/devices/22/drive-removable-media-usb.svg
 share/icons/breeze/devices/22/drive-removable-media.svg
@@ -13336,6 +13534,8 @@ share/icons/breeze/devices/22/media-optical.svg
 share/icons/breeze/devices/22/multimedia-player-ipod-mini-blue.svg
 share/icons/breeze/devices/22/network-bluetooth.svg
 share/icons/breeze/devices/22/network-modem.svg
+share/icons/breeze/devices/22/network-rj11-female.svg
+share/icons/breeze/devices/22/network-rj45-female.svg
 share/icons/breeze/devices/22/network-vpn.svg
 share/icons/breeze/devices/22/network-wired-activated.svg
 share/icons/breeze/devices/22/network-wired-unavailable.svg
@@ -13363,9 +13563,13 @@ share/icons/breeze/devices/64/computer.svg
 share/icons/breeze/devices/64/cpu.svg
 share/icons/breeze/devices/64/cups.svg
 share/icons/breeze/devices/64/cupsprinter.svg
+share/icons/breeze/devices/64/drive-harddisk-encrypted.svg
 share/icons/breeze/devices/64/drive-harddisk-root.svg
 share/icons/breeze/devices/64/drive-harddisk.svg
+share/icons/breeze/devices/64/drive-multidisk.svg
+share/icons/breeze/devices/64/drive-multipartition.svg
 share/icons/breeze/devices/64/drive-optical.svg
+share/icons/breeze/devices/64/drive-partition.svg
 share/icons/breeze/devices/64/drive-removable-media-usb-pendrive.svg
 share/icons/breeze/devices/64/drive-removable-media-usb.svg
 share/icons/breeze/devices/64/drive-removable-media.svg
@@ -13387,6 +13591,8 @@ share/icons/breeze/devices/64/media-optical-video.svg
 share/icons/breeze/devices/64/media-optical.svg
 share/icons/breeze/devices/64/multimedia-player.svg
 share/icons/breeze/devices/64/network-card.svg
+share/icons/breeze/devices/64/network-rj11-female.svg
+share/icons/breeze/devices/64/network-rj45-female.svg
 share/icons/breeze/devices/64/phone.svg
 share/icons/breeze/devices/64/printer.svg
 share/icons/breeze/devices/64/scanner.svg
@@ -13398,11 +13604,15 @@ share/icons/breeze/devices/symbolic/audio-speakers-symbolic.svg
 share/icons/breeze/devices/symbolic/camera-photo-symbolic.svg
 share/icons/breeze/devices/symbolic/camera-web-symbolic.svg
 share/icons/breeze/devices/symbolic/computer-symbolic.svg
+share/icons/breeze/devices/symbolic/drive-harddisk-encrypted-symbolic.svg
 share/icons/breeze/devices/symbolic/drive-harddisk-ieee1394-symbolic.svg
 share/icons/breeze/devices/symbolic/drive-harddisk-root-symbolic.svg
 share/icons/breeze/devices/symbolic/drive-harddisk-symbolic.svg
 share/icons/breeze/devices/symbolic/drive-harddisk-system-symbolic.svg
 share/icons/breeze/devices/symbolic/drive-harddisk-usb-symbolic.svg
+share/icons/breeze/devices/symbolic/drive-multidisk-symbolic.svg
+share/icons/breeze/devices/symbolic/drive-multipartition-symbolic.svg
+share/icons/breeze/devices/symbolic/drive-partition-symbolic.svg
 share/icons/breeze/devices/symbolic/drive-removable-media-symbolic.svg
 share/icons/breeze/devices/symbolic/input-tablet-symbolic.svg
 share/icons/breeze/devices/symbolic/media-flash-symbolic.svg
@@ -13657,6 +13867,7 @@ share/icons/breeze/mimetypes/16/application-vnd.openxmlformats-officedocument.wo
 share/icons/breeze/mimetypes/16/application-vnd.rar.svg
 share/icons/breeze/mimetypes/16/application-vnd.rn-realmedia.svg
 share/icons/breeze/mimetypes/16/application-vnd.scribus.svg
+share/icons/breeze/mimetypes/16/application-vnd.sqlite3.svg
 share/icons/breeze/mimetypes/16/application-vnd.stardivision.calc.svg
 share/icons/breeze/mimetypes/16/application-vnd.stardivision.draw.svg
 share/icons/breeze/mimetypes/16/application-vnd.stardivision.mail.svg
@@ -13978,6 +14189,7 @@ share/icons/breeze/mimetypes/16/text-x-patch.svg
 share/icons/breeze/mimetypes/16/text-x-plain.svg
 share/icons/breeze/mimetypes/16/text-x-po.svg
 share/icons/breeze/mimetypes/16/text-x-python.svg
+share/icons/breeze/mimetypes/16/text-x-python3.svg
 share/icons/breeze/mimetypes/16/text-x-qml.svg
 share/icons/breeze/mimetypes/16/text-x-r.svg
 share/icons/breeze/mimetypes/16/text-x-readme.svg
@@ -14119,6 +14331,7 @@ share/icons/breeze/mimetypes/22/application-vnd.openxmlformats-officedocument.wo
 share/icons/breeze/mimetypes/22/application-vnd.rar.svg
 share/icons/breeze/mimetypes/22/application-vnd.rn-realmedia.svg
 share/icons/breeze/mimetypes/22/application-vnd.scribus.svg
+share/icons/breeze/mimetypes/22/application-vnd.sqlite3.svg
 share/icons/breeze/mimetypes/22/application-vnd.stardivision.calc.svg
 share/icons/breeze/mimetypes/22/application-vnd.stardivision.draw.svg
 share/icons/breeze/mimetypes/22/application-vnd.stardivision.mail.svg
@@ -14439,6 +14652,7 @@ share/icons/breeze/mimetypes/22/text-x-patch.svg
 share/icons/breeze/mimetypes/22/text-x-plain.svg
 share/icons/breeze/mimetypes/22/text-x-po.svg
 share/icons/breeze/mimetypes/22/text-x-python.svg
+share/icons/breeze/mimetypes/22/text-x-python3.svg
 share/icons/breeze/mimetypes/22/text-x-qml.svg
 share/icons/breeze/mimetypes/22/text-x-r.svg
 share/icons/breeze/mimetypes/22/text-x-readme.svg
@@ -14580,6 +14794,7 @@ share/icons/breeze/mimetypes/32/application-vnd.openxmlformats-officedocument.wo
 share/icons/breeze/mimetypes/32/application-vnd.rar.svg
 share/icons/breeze/mimetypes/32/application-vnd.rn-realmedia.svg
 share/icons/breeze/mimetypes/32/application-vnd.scribus.svg
+share/icons/breeze/mimetypes/32/application-vnd.sqlite3.svg
 share/icons/breeze/mimetypes/32/application-vnd.stardivision.calc.svg
 share/icons/breeze/mimetypes/32/application-vnd.stardivision.draw.svg
 share/icons/breeze/mimetypes/32/application-vnd.stardivision.mail.svg
@@ -14900,6 +15115,7 @@ share/icons/breeze/mimetypes/32/text-x-patch.svg
 share/icons/breeze/mimetypes/32/text-x-plain.svg
 share/icons/breeze/mimetypes/32/text-x-po.svg
 share/icons/breeze/mimetypes/32/text-x-python.svg
+share/icons/breeze/mimetypes/32/text-x-python3.svg
 share/icons/breeze/mimetypes/32/text-x-qml.svg
 share/icons/breeze/mimetypes/32/text-x-r.svg
 share/icons/breeze/mimetypes/32/text-x-readme.svg
@@ -15040,6 +15256,7 @@ share/icons/breeze/mimetypes/64/application-vnd.openxmlformats-officedocument.wo
 share/icons/breeze/mimetypes/64/application-vnd.rar.svg
 share/icons/breeze/mimetypes/64/application-vnd.rn-realmedia.svg
 share/icons/breeze/mimetypes/64/application-vnd.scribus.svg
+share/icons/breeze/mimetypes/64/application-vnd.sqlite3.svg
 share/icons/breeze/mimetypes/64/application-vnd.stardivision.calc.svg
 share/icons/breeze/mimetypes/64/application-vnd.stardivision.draw.svg
 share/icons/breeze/mimetypes/64/application-vnd.stardivision.mail.svg
@@ -15361,6 +15578,7 @@ share/icons/breeze/mimetypes/64/text-x-patch.svg
 share/icons/breeze/mimetypes/64/text-x-plain.svg
 share/icons/breeze/mimetypes/64/text-x-po.svg
 share/icons/breeze/mimetypes/64/text-x-python.svg
+share/icons/breeze/mimetypes/64/text-x-python3.svg
 share/icons/breeze/mimetypes/64/text-x-qml.svg
 share/icons/breeze/mimetypes/64/text-x-r.svg
 share/icons/breeze/mimetypes/64/text-x-readme.svg
@@ -15779,20 +15997,67 @@ share/icons/breeze/preferences/32/preferences-desktop-user-password.svg
 share/icons/breeze/preferences/32/preferences-desktop-user.svg
 share/icons/breeze/preferences/32/preferences-desktop-wallpaper.svg
 share/icons/breeze/preferences/32/preferences-desktop.svg
+share/icons/breeze/preferences/32/preferences-devices-cpu.svg
+share/icons/breeze/preferences/32/preferences-devices-drive-optical-check.svg
+share/icons/breeze/preferences/32/preferences-devices-printer.svg
+share/icons/breeze/preferences/32/preferences-devices-scanner.svg
+share/icons/breeze/preferences/32/preferences-devices-tree.svg
 share/icons/breeze/preferences/32/preferences-gtk-config.svg
 share/icons/breeze/preferences/32/preferences-kde-connect.svg
+share/icons/breeze/preferences/32/preferences-log.svg
 share/icons/breeze/preferences/32/preferences-other.svg
 share/icons/breeze/preferences/32/preferences-plugin.svg
+share/icons/breeze/preferences/32/preferences-%%CMAKE_BUILD_TYPE%%notes.svg
+share/icons/breeze/preferences/32/preferences-security-apparmor.svg
+share/icons/breeze/preferences/32/preferences-security-firewall.svg
+share/icons/breeze/preferences/32/preferences-security-kerberos.svg
+share/icons/breeze/preferences/32/preferences-security.svg
+share/icons/breeze/preferences/32/preferences-system-backup.svg
 share/icons/breeze/preferences/32/preferences-system-bluetooth.svg
+share/icons/breeze/preferences/32/preferences-system-linux.svg
 share/icons/breeze/preferences/32/preferences-system-login.svg
+share/icons/breeze/preferences/32/preferences-system-network-dsl.svg
+share/icons/breeze/preferences/32/preferences-system-network-ethernet.svg
+share/icons/breeze/preferences/32/preferences-system-network-iscsi.svg
+share/icons/breeze/preferences/32/preferences-system-network-ldap.svg
+share/icons/breeze/preferences/32/preferences-system-network-nis.svg
+share/icons/breeze/preferences/32/preferences-system-network-ntp.svg
+share/icons/breeze/preferences/32/preferences-system-network-proxy.svg
+share/icons/breeze/preferences/32/preferences-system-network-remote.svg
+share/icons/breeze/preferences/32/preferences-system-network-samba.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-boot.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-dhcp.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-dns.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-ftp.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-installation.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-iscsi.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-kerberos.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-ldap.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-mail.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-nfs.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-nis.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-samba.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-slp.svg
+share/icons/breeze/preferences/32/preferences-system-network-server-web.svg
+share/icons/breeze/preferences/32/preferences-system-network-server.svg
 share/icons/breeze/preferences/32/preferences-system-network-sharing.svg
+share/icons/breeze/preferences/32/preferences-system-network-vpn.svg
+share/icons/breeze/preferences/32/preferences-system-network-wakeonlan.svg
 share/icons/breeze/preferences/32/preferences-system-network.svg
 share/icons/breeze/preferences/32/preferences-system-power-management.svg
+share/icons/breeze/preferences/32/preferences-system-services.svg
 share/icons/breeze/preferences/32/preferences-system-session-services.svg
+share/icons/breeze/preferences/32/preferences-system-startup.svg
 share/icons/breeze/preferences/32/preferences-system-time.svg
+share/icons/breeze/preferences/32/preferences-system-user-sudo.svg
 share/icons/breeze/preferences/32/preferences-system-windows-actions.svg
 share/icons/breeze/preferences/32/preferences-system-windows-move.svg
 share/icons/breeze/preferences/32/preferences-system-windows.svg
+share/icons/breeze/preferences/32/preferences-virtualization-container.svg
+share/icons/breeze/preferences/32/preferences-virtualization-vm-install.svg
+share/icons/breeze/preferences/32/preferences-virtualization-vm-migrate.svg
+share/icons/breeze/preferences/32/preferences-virtualization-vm-new.svg
+share/icons/breeze/preferences/32/preferences-virtualization-vm.svg
 share/icons/breeze/preferences/32/preferences-web-browser-adblock.svg
 share/icons/breeze/preferences/32/preferences-web-browser-cache.svg
 share/icons/breeze/preferences/32/preferences-web-browser-cookies.svg
@@ -15800,9 +16065,79 @@ share/icons/breeze/preferences/32/preferences-web-browser-identification.svg
 share/icons/breeze/preferences/32/preferences-web-browser-shortcuts.svg
 share/icons/breeze/preferences/32/preferences-web-browser-ssl.svg
 share/icons/breeze/preferences/32/preferences-web-browser-stylesheets.svg
+share/icons/breeze/preferences/32/preferences.svg
 share/icons/breeze/preferences/32/system-lock-screen.svg
 share/icons/breeze/preferences/32/system-users.svg
 share/icons/breeze/preferences/32/window-duplicate.svg
+share/icons/breeze/preferences/32/yast-addon.svg
+share/icons/breeze/preferences/32/yast-alternatives.svg
+share/icons/breeze/preferences/32/yast-apparmor.svg
+share/icons/breeze/preferences/32/yast-auth-client.svg
+share/icons/breeze/preferences/32/yast-autoyast.svg
+share/icons/breeze/preferences/32/yast-bootloader.svg
+share/icons/breeze/preferences/32/yast-checkmedia.svg
+share/icons/breeze/preferences/32/yast-create-new-vm.svg
+share/icons/breeze/preferences/32/yast-device-tree.svg
+share/icons/breeze/preferences/32/yast-dhcp-server.svg
+share/icons/breeze/preferences/32/yast-disk.svg
+share/icons/breeze/preferences/32/yast-dns-server.svg
+share/icons/breeze/preferences/32/yast-docker.svg
+share/icons/breeze/preferences/32/yast-dsl.svg
+share/icons/breeze/preferences/32/yast-fcoe.svg
+share/icons/breeze/preferences/32/yast-firewall.svg
+share/icons/breeze/preferences/32/yast-fonts.svg
+share/icons/breeze/preferences/32/yast-ftp-server.svg
+share/icons/breeze/preferences/32/yast-hardware.svg
+share/icons/breeze/preferences/32/yast-host.svg
+share/icons/breeze/preferences/32/yast-http-server.svg
+share/icons/breeze/preferences/32/yast-hwinfo.svg
+share/icons/breeze/preferences/32/yast-instserver.svg
+share/icons/breeze/preferences/32/yast-iscsi-client.svg
+share/icons/breeze/preferences/32/yast-iscsi-server.svg
+share/icons/breeze/preferences/32/yast-journal.svg
+share/icons/breeze/preferences/32/yast-kerberos-server.svg
+share/icons/breeze/preferences/32/yast-kernel.svg
+share/icons/breeze/preferences/32/yast-keyboard.svg
+share/icons/breeze/preferences/32/yast-lan.svg
+share/icons/breeze/preferences/32/yast-language.svg
+share/icons/breeze/preferences/32/yast-ldap-server.svg
+share/icons/breeze/preferences/32/yast-ldap.svg
+share/icons/breeze/preferences/32/yast-mail.svg
+share/icons/breeze/preferences/32/yast-messages.svg
+share/icons/breeze/preferences/32/yast-misc.svg
+share/icons/breeze/preferences/32/yast-network.svg
+share/icons/breeze/preferences/32/yast-nfs-server.svg
+share/icons/breeze/preferences/32/yast-nfs.svg
+share/icons/breeze/preferences/32/yast-nis-server.svg
+share/icons/breeze/preferences/32/yast-nis.svg
+share/icons/breeze/preferences/32/yast-ntp-client.svg
+share/icons/breeze/preferences/32/yast-printer.svg
+share/icons/breeze/preferences/32/yast-proxy.svg
+share/icons/breeze/preferences/32/yast-%%CMAKE_BUILD_TYPE%%-notes.svg
+share/icons/breeze/preferences/32/yast-remote.svg
+share/icons/breeze/preferences/32/yast-samba-client.svg
+share/icons/breeze/preferences/32/yast-samba-server.svg
+share/icons/breeze/preferences/32/yast-scanner.svg
+share/icons/breeze/preferences/32/yast-security.svg
+share/icons/breeze/preferences/32/yast-services-manager.svg
+share/icons/breeze/preferences/32/yast-slp-server.svg
+share/icons/breeze/preferences/32/yast-snapper.svg
+share/icons/breeze/preferences/32/yast-software.svg
+share/icons/breeze/preferences/32/yast-sound.svg
+share/icons/breeze/preferences/32/yast-sudo.svg
+share/icons/breeze/preferences/32/yast-support.svg
+share/icons/breeze/preferences/32/yast-sw_source.svg
+share/icons/breeze/preferences/32/yast-sysconfig.svg
+share/icons/breeze/preferences/32/yast-system.svg
+share/icons/breeze/preferences/32/yast-tftp-server.svg
+share/icons/breeze/preferences/32/yast-timezone.svg
+share/icons/breeze/preferences/32/yast-update.svg
+share/icons/breeze/preferences/32/yast-users.svg
+share/icons/breeze/preferences/32/yast-vm-install.svg
+share/icons/breeze/preferences/32/yast-vm-migrate.svg
+share/icons/breeze/preferences/32/yast-vm.svg
+share/icons/breeze/preferences/32/yast-vpn.svg
+share/icons/breeze/preferences/32/yast-wol.svg
 share/icons/breeze/status/16/audio-off.svg
 share/icons/breeze/status/16/audio-on.svg
 share/icons/breeze/status/16/audio-ready.svg
@@ -15861,6 +16196,9 @@ share/icons/breeze/status/16/user-invisible.svg
 share/icons/breeze/status/16/user-offline.svg
 share/icons/breeze/status/16/user-online.svg
 share/icons/breeze/status/16@2x
+share/icons/breeze/status/22/audio-off.svg
+share/icons/breeze/status/22/audio-on.svg
+share/icons/breeze/status/22/audio-ready.svg
 share/icons/breeze/status/22/audio-volume-high.svg
 share/icons/breeze/status/22/audio-volume-low.svg
 share/icons/breeze/status/22/audio-volume-medium.svg
--- b/x11-themes/kf5-kemoticons/distinfo	
+++ b/x11-themes/kf5-kemoticons/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691291
-SHA256 (KDE/frameworks/5.53.0/kemoticons-5.53.0.tar.xz) = 1c6cff3a28ea68357db2edd483f25b7a98bf0a1b480c8dcd90ac727d0bcb3275
-SIZE (KDE/frameworks/5.53.0/kemoticons-5.53.0.tar.xz) = 1695884
+TIMESTAMP = 1546843261
+SHA256 (KDE/frameworks/5.54.0/kemoticons-5.54.0.tar.xz) = 5bf4ad3bedd79b48d1b0f3be2dbc0932eae5fc35d8a05115c7e55470af73ec7a
+SIZE (KDE/frameworks/5.54.0/kemoticons-5.54.0.tar.xz) = 1696352
--- b/x11-themes/kf5-kemoticons/pkg-plist	
+++ b/x11-themes/kf5-kemoticons/pkg-plist	
@@ -1,3 +1,4 @@ 
+etc/xdg/kemoticons.categories
 include/KF5/KEmoticons/KEmoticons
 include/KF5/KEmoticons/KEmoticonsProvider
 include/KF5/KEmoticons/KEmoticonsTheme
--- b/x11-themes/kf5-kiconthemes/distinfo	
+++ b/x11-themes/kf5-kiconthemes/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691292
-SHA256 (KDE/frameworks/5.53.0/kiconthemes-5.53.0.tar.xz) = 38d1a89281341444c5c3615a4ccab0785f8488c2b6437a67b8a417a01aaea4c0
-SIZE (KDE/frameworks/5.53.0/kiconthemes-5.53.0.tar.xz) = 207456
+TIMESTAMP = 1546843262
+SHA256 (KDE/frameworks/5.54.0/kiconthemes-5.54.0.tar.xz) = ef34a81fa3413c8052f8cb39d1b12c19489341bd83773af7ba3ffad195518341
+SIZE (KDE/frameworks/5.54.0/kiconthemes-5.54.0.tar.xz) = 207420
--- b/x11-themes/kf5-oxygen-icons5/distinfo	
+++ b/x11-themes/kf5-oxygen-icons5/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691292
-SHA256 (KDE/frameworks/5.53.0/oxygen-icons5-5.53.0.tar.xz) = d588032d5a630a2d7e497dfa4ee9c7895924c835b842ce1962553c3bf5dfec8e
-SIZE (KDE/frameworks/5.53.0/oxygen-icons5-5.53.0.tar.xz) = 236762900
+TIMESTAMP = 1546843262
+SHA256 (KDE/frameworks/5.54.0/oxygen-icons5-5.54.0.tar.xz) = 8628fe74851527d94510df37d8875f73c60b15700c3295790d8d503f9f47ade9
+SIZE (KDE/frameworks/5.54.0/oxygen-icons5-5.54.0.tar.xz) = 236759924
--- b/x11-themes/kf5-qqc2-desktop-style/distinfo	
+++ b/x11-themes/kf5-qqc2-desktop-style/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691293
-SHA256 (KDE/frameworks/5.53.0/qqc2-desktop-style-5.53.0.tar.xz) = 04d4ed66dd50d0221a04011da8d01376cfbf6b4306760414d0c57e8eeb7027b8
-SIZE (KDE/frameworks/5.53.0/qqc2-desktop-style-5.53.0.tar.xz) = 42956
+TIMESTAMP = 1546843263
+SHA256 (KDE/frameworks/5.54.0/qqc2-desktop-style-5.54.0.tar.xz) = c8aff0d5f5c8e2f08749f5b83eec0722fe0dbd8e63ff42fdb7aa97cc0c1b1cea
+SIZE (KDE/frameworks/5.54.0/qqc2-desktop-style-5.54.0.tar.xz) = 42988
--- b/x11-toolkits/kf5-attica/distinfo	
+++ b/x11-toolkits/kf5-attica/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691293
-SHA256 (KDE/frameworks/5.53.0/attica-5.53.0.tar.xz) = 8ff698aae6288d5bc4ef2d8762c420840d111c948c03b10f2968ff504ae9c262
-SIZE (KDE/frameworks/5.53.0/attica-5.53.0.tar.xz) = 62552
+TIMESTAMP = 1546843263
+SHA256 (KDE/frameworks/5.54.0/attica-5.54.0.tar.xz) = 962af14dd6ae990aa77802d8be034aeb6195ea4064d098a8ef05abe12ae027bf
+SIZE (KDE/frameworks/5.54.0/attica-5.54.0.tar.xz) = 62588
--- b/x11-toolkits/kf5-kcompletion/distinfo	
+++ b/x11-toolkits/kf5-kcompletion/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691293
-SHA256 (KDE/frameworks/5.53.0/kcompletion-5.53.0.tar.xz) = c9f5c73178ee76308d0b9e5eef3d1338dcb8b4fab64aff0b278e3e24d405ae01
-SIZE (KDE/frameworks/5.53.0/kcompletion-5.53.0.tar.xz) = 115448
+TIMESTAMP = 1546843263
+SHA256 (KDE/frameworks/5.54.0/kcompletion-5.54.0.tar.xz) = c010352c5858df9ab184c0d8ba0e72278132cabcd2f7d6c0b3b6aa936802ef69
+SIZE (KDE/frameworks/5.54.0/kcompletion-5.54.0.tar.xz) = 115440
--- b/x11-toolkits/kf5-kconfigwidgets/distinfo	
+++ b/x11-toolkits/kf5-kconfigwidgets/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691293
-SHA256 (KDE/frameworks/5.53.0/kconfigwidgets-5.53.0.tar.xz) = 7b0a87f74462adf9738a41599c63f8fb044a5f955420c74a71274ee582a4fe2e
-SIZE (KDE/frameworks/5.53.0/kconfigwidgets-5.53.0.tar.xz) = 373704
+TIMESTAMP = 1546843263
+SHA256 (KDE/frameworks/5.54.0/kconfigwidgets-5.54.0.tar.xz) = 617090206976f2434e76d0bec2d96b89aa7ff01d602f558ab5f57cfbf08170d0
+SIZE (KDE/frameworks/5.54.0/kconfigwidgets-5.54.0.tar.xz) = 373608
--- b/x11-toolkits/kf5-kdesignerplugin/distinfo	
+++ b/x11-toolkits/kf5-kdesignerplugin/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691294
-SHA256 (KDE/frameworks/5.53.0/kdesignerplugin-5.53.0.tar.xz) = 06a3038e163e0c690d3be0c8636d033cc4e7bf9bbd5c5f6bb5f54aed6fd51ed4
-SIZE (KDE/frameworks/5.53.0/kdesignerplugin-5.53.0.tar.xz) = 90672
+TIMESTAMP = 1546843263
+SHA256 (KDE/frameworks/5.54.0/kdesignerplugin-5.54.0.tar.xz) = eaa19ffbe0af34ae8e132048cd4d78689e9a46c711f7b022dccbb4d1bee59e42
+SIZE (KDE/frameworks/5.54.0/kdesignerplugin-5.54.0.tar.xz) = 90688
--- b/x11-toolkits/kf5-kguiaddons/distinfo	
+++ b/x11-toolkits/kf5-kguiaddons/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691294
-SHA256 (KDE/frameworks/5.53.0/kguiaddons-5.53.0.tar.xz) = e6f8e20b128486aebd8b77915cd6d98ad33df791d9d1ea00c896627af09641ce
-SIZE (KDE/frameworks/5.53.0/kguiaddons-5.53.0.tar.xz) = 40260
+TIMESTAMP = 1546843264
+SHA256 (KDE/frameworks/5.54.0/kguiaddons-5.54.0.tar.xz) = 6524990f6df7db84ecb7f13250085ab9ce12fa43b2c47e81018755d9b0ee7852
+SIZE (KDE/frameworks/5.54.0/kguiaddons-5.54.0.tar.xz) = 40244
--- b/x11-toolkits/kf5-kirigami2/distinfo	
+++ b/x11-toolkits/kf5-kirigami2/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691294
-SHA256 (KDE/frameworks/5.53.0/kirigami2-5.53.0.tar.xz) = 31fe9116af88bb2e4016087b29b01c9ab1bc651b1ec4cf7cbb6e70fea93e792b
-SIZE (KDE/frameworks/5.53.0/kirigami2-5.53.0.tar.xz) = 124124
+TIMESTAMP = 1546843264
+SHA256 (KDE/frameworks/5.54.0/kirigami2-5.54.0.tar.xz) = e2be481f890a1b7186725742b5f0240d042f78adc0bfbac0de53dd3df24ade46
+SIZE (KDE/frameworks/5.54.0/kirigami2-5.54.0.tar.xz) = 125784
--- b/x11-toolkits/kf5-kitemviews/distinfo	
+++ b/x11-toolkits/kf5-kitemviews/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691295
-SHA256 (KDE/frameworks/5.53.0/kitemviews-5.53.0.tar.xz) = b87a79f360683149af0b65d63d192b89ae6b0786b08daf6a52fa9e09d2adc064
-SIZE (KDE/frameworks/5.53.0/kitemviews-5.53.0.tar.xz) = 75000
+TIMESTAMP = 1546843264
+SHA256 (KDE/frameworks/5.54.0/kitemviews-5.54.0.tar.xz) = b38e892c42681ef94a978e11bbaa83568004afc6972a11d6ce0789193b8a89b3
+SIZE (KDE/frameworks/5.54.0/kitemviews-5.54.0.tar.xz) = 75028
--- b/x11-toolkits/kf5-kjobwidgets/distinfo	
+++ b/x11-toolkits/kf5-kjobwidgets/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691295
-SHA256 (KDE/frameworks/5.53.0/kjobwidgets-5.53.0.tar.xz) = 40983b7b7e777ad79f962cdc19f97f9fd58ccd338f6b7e882a8b051574c03c98
-SIZE (KDE/frameworks/5.53.0/kjobwidgets-5.53.0.tar.xz) = 87252
+TIMESTAMP = 1546843264
+SHA256 (KDE/frameworks/5.54.0/kjobwidgets-5.54.0.tar.xz) = b8bf2e4893b1a542bb07e5d5761a463add4e9e7637ff4bc6255a382a97ea7234
+SIZE (KDE/frameworks/5.54.0/kjobwidgets-5.54.0.tar.xz) = 87256
--- b/x11-toolkits/kf5-ktextwidgets/distinfo	
+++ b/x11-toolkits/kf5-ktextwidgets/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691295
-SHA256 (KDE/frameworks/5.53.0/ktextwidgets-5.53.0.tar.xz) = aced892ccc071a5420189528fb9b9609d094d6d6eb450385a98d9f5b4f0fbf08
-SIZE (KDE/frameworks/5.53.0/ktextwidgets-5.53.0.tar.xz) = 307928
+TIMESTAMP = 1546843264
+SHA256 (KDE/frameworks/5.54.0/ktextwidgets-5.54.0.tar.xz) = 854283daf844685513ffc150c2958f7f1a38aa9ed5050e09a1079d7eac1a9294
+SIZE (KDE/frameworks/5.54.0/ktextwidgets-5.54.0.tar.xz) = 308088
--- b/x11-toolkits/kf5-kwidgetsaddons/distinfo	
+++ b/x11-toolkits/kf5-kwidgetsaddons/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691295
-SHA256 (KDE/frameworks/5.53.0/kwidgetsaddons-5.53.0.tar.xz) = ac92cb9b745664292efac832f6b104d398f0f9e88f54a42f69bfbd7fd91b3ecd
-SIZE (KDE/frameworks/5.53.0/kwidgetsaddons-5.53.0.tar.xz) = 2187316
+TIMESTAMP = 1546843264
+SHA256 (KDE/frameworks/5.54.0/kwidgetsaddons-5.54.0.tar.xz) = f009b49ae0eb6deaa814defcfbf7ed8a27b8d874a11a0754855fb917219d1d07
+SIZE (KDE/frameworks/5.54.0/kwidgetsaddons-5.54.0.tar.xz) = 2187048
--- b/x11-toolkits/kf5-kxmlgui/distinfo	
+++ b/x11-toolkits/kf5-kxmlgui/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691296
-SHA256 (KDE/frameworks/5.53.0/kxmlgui-5.53.0.tar.xz) = 2ea9d75bf6405dad3db0cb6f017030be139e3bc6e223ed235237e3cf09bd97a9
-SIZE (KDE/frameworks/5.53.0/kxmlgui-5.53.0.tar.xz) = 869296
+TIMESTAMP = 1546843265
+SHA256 (KDE/frameworks/5.54.0/kxmlgui-5.54.0.tar.xz) = 077796971634ae2c51735578f8617eba594345b1ca08ea9f4d97d580f0baca06
+SIZE (KDE/frameworks/5.54.0/kxmlgui-5.54.0.tar.xz) = 869308
--- b/x11/kf5-frameworkintegration/distinfo	
+++ b/x11/kf5-frameworkintegration/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691296
-SHA256 (KDE/frameworks/5.53.0/frameworkintegration-5.53.0.tar.xz) = f2a69ef90c3f48a6704ec10defe1d752a5c30805b4b5cf22bcd52469e7fbba28
-SIZE (KDE/frameworks/5.53.0/frameworkintegration-5.53.0.tar.xz) = 1753056
+TIMESTAMP = 1546843265
+SHA256 (KDE/frameworks/5.54.0/frameworkintegration-5.54.0.tar.xz) = 4d6c6c02eac8b538052c09de7a6e5d4209a5de3f5639bd367950c2c39b1ff1e7
+SIZE (KDE/frameworks/5.54.0/frameworkintegration-5.54.0.tar.xz) = 1753080
--- b/x11/kf5-kactivities-stats/distinfo	
+++ b/x11/kf5-kactivities-stats/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691297
-SHA256 (KDE/frameworks/5.53.0/kactivities-stats-5.53.0.tar.xz) = 5614bda2ffaf89e6f53a761ca2f4800f73d1b74c10b6f051bc5402084a9da62d
-SIZE (KDE/frameworks/5.53.0/kactivities-stats-5.53.0.tar.xz) = 61136
+TIMESTAMP = 1546843265
+SHA256 (KDE/frameworks/5.54.0/kactivities-stats-5.54.0.tar.xz) = ed9073b6a6ef3fc25fa87d1de49aca65ce82d4b534ac31d6527c1705427047db
+SIZE (KDE/frameworks/5.54.0/kactivities-stats-5.54.0.tar.xz) = 61152
--- b/x11/kf5-kactivities/distinfo	
+++ b/x11/kf5-kactivities/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691296
-SHA256 (KDE/frameworks/5.53.0/kactivities-5.53.0.tar.xz) = c62d6453bd4dcbac296b80dc092fc8c5225661d27f7c11b2bc33791223824ede
-SIZE (KDE/frameworks/5.53.0/kactivities-5.53.0.tar.xz) = 61432
+TIMESTAMP = 1546843265
+SHA256 (KDE/frameworks/5.54.0/kactivities-5.54.0.tar.xz) = 34cada127854402f8d5b6b45add1044888378be54bc5b599f5069f675e38f846
+SIZE (KDE/frameworks/5.54.0/kactivities-5.54.0.tar.xz) = 61416
--- b/x11/kf5-kded/distinfo	
+++ b/x11/kf5-kded/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691297
-SHA256 (KDE/frameworks/5.53.0/kded-5.53.0.tar.xz) = 88d8475eab6ff5eed59e3edb632157dfde6c95c1495237eb6d5491dbda11d0a3
-SIZE (KDE/frameworks/5.53.0/kded-5.53.0.tar.xz) = 37912
+TIMESTAMP = 1546843265
+SHA256 (KDE/frameworks/5.54.0/kded-5.54.0.tar.xz) = f6e16c19d073dfc0a908bddead6337debbe3bf9429c8b09c0ed0cf8d6fdf308c
+SIZE (KDE/frameworks/5.54.0/kded-5.54.0.tar.xz) = 37920
--- b/x11/kf5-kdelibs4support/distinfo	
+++ b/x11/kf5-kdelibs4support/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691297
-SHA256 (KDE/frameworks/5.53.0/kdelibs4support-5.53.0.tar.xz) = 208a2f308aa55a1ec9c311e3c3224d65d78feb53a1df127b26007f046a9821aa
-SIZE (KDE/frameworks/5.53.0/kdelibs4support-5.53.0.tar.xz) = 3347456
+TIMESTAMP = 1546843266
+SHA256 (KDE/frameworks/5.54.0/kdelibs4support-5.54.0.tar.xz) = b541c0c135f9f561a194d793924e699c5d79729687529789bb84522d99a3730a
+SIZE (KDE/frameworks/5.54.0/kdelibs4support-5.54.0.tar.xz) = 3497156
--- b/x11/kf5-kdelibs4support/pkg-plist	
+++ b/x11/kf5-kdelibs4support/pkg-plist	
@@ -1024,6 +1024,8 @@ share/dbus-1/interfaces/kf5_org.freedesktop.PowerManagement.Inhibit.xml
 share/dbus-1/interfaces/kf5_org.freedesktop.PowerManagement.xml
 share/dbus-1/interfaces/kf5_org.kde.Solid.Networking.Client.xml
 share/dbus-1/interfaces/kf5_org.kde.Solid.PowerManagement.PolicyAgent.xml
+share/doc/HTML/ca/kcontrol5/kcm_ssl/details.png
+share/doc/HTML/ca/kcontrol5/kcm_ssl/module.png
 share/doc/HTML/ca/kcontrol5/kcm_ssl/index.cache.bz2
 share/doc/HTML/ca/kcontrol5/kcm_ssl/index.docbook
 share/doc/HTML/ca/kdebugdialog5/index.cache.bz2
--- b/x11/kf5-kglobalaccel/distinfo	
+++ b/x11/kf5-kglobalaccel/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691297
-SHA256 (KDE/frameworks/5.53.0/kglobalaccel-5.53.0.tar.xz) = 11f32165d3d457e1eb1948bdab24c4bf89484223842893a589e4df04069dc0c0
-SIZE (KDE/frameworks/5.53.0/kglobalaccel-5.53.0.tar.xz) = 83864
+TIMESTAMP = 1546843266
+SHA256 (KDE/frameworks/5.54.0/kglobalaccel-5.54.0.tar.xz) = 41070d9909de17efeb95b5c0dc2bf52d9dded09ff4c5ca44891ad8c0f245f481
+SIZE (KDE/frameworks/5.54.0/kglobalaccel-5.54.0.tar.xz) = 83848
--- b/x11/kf5-kinit/distinfo	
+++ b/x11/kf5-kinit/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691298
-SHA256 (KDE/frameworks/5.53.0/kinit-5.53.0.tar.xz) = 5ce5b20ffdbd0bc5bd8ee5c261196319f53bfe93635228870ff601aa8a09ad91
-SIZE (KDE/frameworks/5.53.0/kinit-5.53.0.tar.xz) = 120240
+TIMESTAMP = 1546843266
+SHA256 (KDE/frameworks/5.54.0/kinit-5.54.0.tar.xz) = 2982caa7157486b2c7657779476d5e4e2234f5554fa69848b41737ed2733b95e
+SIZE (KDE/frameworks/5.54.0/kinit-5.54.0.tar.xz) = 120228
--- b/x11/kf5-krunner/distinfo	
+++ b/x11/kf5-krunner/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691298
-SHA256 (KDE/frameworks/5.53.0/krunner-5.53.0.tar.xz) = 9480d4cecd9e1de2c386d09353c63881889bd2ee657d6ffe733086893011c826
-SIZE (KDE/frameworks/5.53.0/krunner-5.53.0.tar.xz) = 61912
+TIMESTAMP = 1546843266
+SHA256 (KDE/frameworks/5.54.0/krunner-5.54.0.tar.xz) = 1be00fe8847c9e6389ceb95cb077018a8d1380f4f97a1513e6462431b648c51b
+SIZE (KDE/frameworks/5.54.0/krunner-5.54.0.tar.xz) = 61908
--- b/x11/kf5-kwayland/Makefile	
+++ b/x11/kf5-kwayland/Makefile	
@@ -2,7 +2,6 @@ 
 
 PORTNAME=	kwayland
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
--- b/x11/kf5-kwayland/distinfo	
+++ b/x11/kf5-kwayland/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691298
-SHA256 (KDE/frameworks/5.53.0/kwayland-5.53.0.tar.xz) = 7098628c95f2a47fe8dea8ef7b85179449e2cb13ff94732d9e3375c60647d24c
-SIZE (KDE/frameworks/5.53.0/kwayland-5.53.0.tar.xz) = 333456
+TIMESTAMP = 1546843266
+SHA256 (KDE/frameworks/5.54.0/kwayland-5.54.0.tar.xz) = eec5aa12391a1097b47bdcb25273054081928bb0de1ae1ff198e626428082778
+SIZE (KDE/frameworks/5.54.0/kwayland-5.54.0.tar.xz) = 338316
--- b/x11/kf5-kwayland/pkg-plist	
+++ b/x11/kf5-kwayland/pkg-plist	
@@ -44,7 +44,9 @@ include/KF5/KWayland/Client/subsurface.h
 include/KF5/KWayland/Client/surface.h
 include/KF5/KWayland/Client/textinput.h
 include/KF5/KWayland/Client/touch.h
-include/KF5/KWayland/Client/xdgforeign_v2.h
+include/KF5/KWayland/Client/xdgdecoration.h
+include/KF5/KWayland/Client/xdgforeign.h
+include/KF5/KWayland/Server/xdgdecoration_interface.h
 include/KF5/KWayland/Client/xdgoutput.h
 include/KF5/KWayland/Client/xdgshell.h
 include/KF5/KWayland/Server/appmenu_interface.h
--- b/x11/kf5-kwindowsystem/distinfo	
+++ b/x11/kf5-kwindowsystem/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691299
-SHA256 (KDE/frameworks/5.53.0/kwindowsystem-5.53.0.tar.xz) = 9fb2009a1915167e243d4182a5cf8932bfe416b31a2f13f06256f3e1eb5809fd
-SIZE (KDE/frameworks/5.53.0/kwindowsystem-5.53.0.tar.xz) = 169740
+TIMESTAMP = 1546843266
+SHA256 (KDE/frameworks/5.54.0/kwindowsystem-5.54.0.tar.xz) = cb3adf88fd39643979a80428b3a5e91d156c8f7798decbf65649c058de2330d9
+SIZE (KDE/frameworks/5.54.0/kwindowsystem-5.54.0.tar.xz) = 169772
--- b/x11/kf5-plasma-framework/distinfo	
+++ b/x11/kf5-plasma-framework/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1543691299
-SHA256 (KDE/frameworks/5.53.0/plasma-framework-5.53.0.tar.xz) = d5d36826af3363a89ff76292dd0f7c8fee91a6595039b1ea6cbb05c309b09e6b
-SIZE (KDE/frameworks/5.53.0/plasma-framework-5.53.0.tar.xz) = 4630584
+TIMESTAMP = 1546843267
+SHA256 (KDE/frameworks/5.54.0/plasma-framework-5.54.0.tar.xz) = f21386787550574ec152190fcb744c83e9153cb40b326fc7a7d11c9b238a63a4
+SIZE (KDE/frameworks/5.54.0/plasma-framework-5.54.0.tar.xz) = 4631204