Attachment 205554 Details for Bug 234216 – Update bredbandskollen and fix build with gcc

[patch] Update bredbandskollen and fix build with gcc

ports.net.bredbandskollen.20190705.diff (text/plain), 340.48 KB, created by Niclas Zeising on 2019-07-06 21:33:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niclas Zeising

Created: 2019-07-06 21:33:38 UTC

Size: 340.48 KB

patch

obsolete

>diff --git a/MOVED b/MOVED
>index e6bf42efccbe..fe8c8b97443a 100644
>--- a/MOVED
>+++ b/MOVED
>@@ -12843,4 +12843,3 @@ emulators/xen-kernel47|emulators/xen-kernel|2019-07-01|Has expired: This port is
> sysutils/xen-tools47|sysutils/xen-tools|2019-07-01|Has expired: This port is about to be removed, please update to a newer Xen version
> www/palemoon||2019-07-03|Not maintained and full of security holes
> www/seamonkey||2019-07-03|2.49.* is not maintained upstream and full of security holes
>-www/tomcat8||2019-07-06|Has expired: EoL since 2018-06-30
>diff --git a/UPDATING b/UPDATING
>index 8298081f217a..13741a4b299a 100644
>--- a/UPDATING
>+++ b/UPDATING
>@@ -6,13 +6,6 @@ You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
> 
>-20190705:
>-  AFFECTS: users of net/serviio which bought a license for the non-free features
>-  AUTHOR: netchild@FreeBSD.org
>-
>-  Version 2 of serviio needs a new license file. Updating without a new license
>-  file will disable the non-free features.
>-
> 20190701:
>   AFFECTS: users of databases/mysql56-(server|client)
>   AUTHOR: ale@FreeBSD.org
>diff --git a/archivers/libunrar5/Makefile b/archivers/libunrar5/Makefile
>index f5ec2952a8a7..1b7ec808bcd7 100644
>--- a/archivers/libunrar5/Makefile
>+++ b/archivers/libunrar5/Makefile
>@@ -14,7 +14,7 @@ LICENSE_NAME=	UnRAR License
> LICENSE_FILE=	${WRKSRC}/license.txt
> LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>-USES=		compiler:c++11-lang gmake
>+USES=		gmake
> USE_LDCONFIG=	yes
> 
> ALL_TARGET=	lib
>diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile
>index 9d93f60d02c2..d44c40da8f3d 100644
>--- a/astro/libosmpbf/Makefile
>+++ b/astro/libosmpbf/Makefile
>@@ -4,7 +4,7 @@
> PORTNAME=	libosmpbf
> PORTVERSION=	1.3.3
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	11
>+PORTREVISION=	10
> CATEGORIES=	astro geography devel
> 
> MAINTAINER=	amdmi3@FreeBSD.org
>diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
>index 416171f8f61a..a46e444eb8a6 100644
>--- a/astro/merkaartor/Makefile
>+++ b/astro/merkaartor/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	merkaartor
> PORTVERSION=	0.18.2
>-PORTREVISION=	19
>+PORTREVISION=	18
> CATEGORIES=	astro
> 
> MAINTAINER=	dev2@heesakkers.info
>diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
>index 54125ab6e581..aac2a44c3cb6 100644
>--- a/audio/amarok/Makefile
>+++ b/audio/amarok/Makefile
>@@ -2,9 +2,9 @@
> 
> PORTNAME=	amarok
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.9.70
>-PKGVERSIONSUFFIX=	-g${GH_TAGNAME}
>-PORTREVISION=	0
>+DISTVERSION=	2.9.0-277
>+DISTVERSIONSUFFIX=	-gd50ecc430c
>+PORTREVISION=	4
> CATEGORIES=	audio kde
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -30,7 +30,7 @@ USE_QT=		core concurrent declarative dbus gui location network phonon4 \
> 		webkit widgets xml \
> 		buildtools_build qmake_build
> 
>-USE_KDE=	archive auth attica bookmarks codecs config configwidgets \
>+USE_KDE=        archive auth attica bookmarks codecs config configwidgets \
> 		completion coreaddons crash dbusaddons dnssd globalaccel \
> 		guiaddons i18n iconthemes itemviews jobwidgets kdeclarative \
> 		kcmutils kio kirigami2 newstuff notifications notifyconfig \
>@@ -42,7 +42,6 @@ USE_LDCONFIG=	yes
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	kde
>-GH_TAGNAME=	0aa6ae0c77
> 
> SHEBANG_FILES=	src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
> CMAKE_ARGS=	-DOPENSSL_ROOT_DIR=${OPENSSLBASE}
>@@ -68,7 +67,6 @@ IPOD_CMAKE_BOOL=	WITH_IPOD
> MP3TUNES_DESC=		MP3tunes support
> MP3TUNES_LIB_DEPENDS=	libloudmouth-1.so:net-im/loudmouth \
> 			libcurl.so:ftp/curl
>-MP3TUNES_LIB_DEPENDS_OFF=	libgcrypt.so:security/libgcrypt
> MP3TUNES_USE=		GNOME=glib20,libxml2
> MP3TUNES_USES=		gnome ssl
> 
>diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
>index b0525dabba18..af71c6cadc48 100644
>--- a/audio/amarok/distinfo
>+++ b/audio/amarok/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1558016091
>-SHA256 (kde-amarok-v2.9.70-0aa6ae0c77_GH0.tar.gz) = 2c236fb6853d697f3cb80bfc8289c2bdfa39098b662938143bc6b287f4c7cb84
>-SIZE (kde-amarok-v2.9.70-0aa6ae0c77_GH0.tar.gz) = 21070462
>+TIMESTAMP = 1545825317
>+SHA256 (kde-amarok-v2.9.0-277-gd50ecc430c_GH0.tar.gz) = e1dc7d1fe11f88a4b71e69ebeb94b62c63db6f1f5ac52ddeed89d92343108e9f
>+SIZE (kde-amarok-v2.9.0-277-gd50ecc430c_GH0.tar.gz) = 21062595
>diff --git a/audio/amarok/files/patch-CMakeLists.txt b/audio/amarok/files/patch-CMakeLists.txt
>deleted file mode 100644
>index 5c63ac9870c8..000000000000
>--- a/audio/amarok/files/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- CMakeLists.txt.orig	2019-04-30 03:42:56 UTC
>-+++ CMakeLists.txt
>-@@ -207,6 +207,8 @@ if( WITH_PLAYER )
>-     # zlib is required for mysql embedded
>-     find_package(ZLIB REQUIRED)
>-     set_package_properties( ZLIB PROPERTIES DESCRIPTION "zlib" TYPE REQUIRED )
>-+    # SSL is required for mysql embedded
>-+    find_package(OpenSSL REQUIRED)
>- 
>-     # We tell users that we need 1.0.3, but we really check just >= 1.0.0. This is because
>-     # upstream forgot to update version in lastfm/global.h, so it looks like 1.0.2. :-(
>diff --git a/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake b/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake
>index 89acc30d09d3..5e9c57bc93a5 100644
>--- a/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake
>+++ b/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake
>@@ -1,6 +1,6 @@
>---- cmake/modules/FindMySQL.cmake.orig	2019-04-30 03:42:56 UTC
>+--- cmake/modules/FindMySQL.cmake.orig	2019-06-14 07:24:31 UTC
> +++ cmake/modules/FindMySQL.cmake
>-@@ -31,18 +31,20 @@ if(MYSQLCONFIG_EXECUTABLE)
>+@@ -31,21 +31,7 @@ if(MYSQLCONFIG_EXECUTABLE)
>          OUTPUT_STRIP_TRAILING_WHITESPACE
>      )
>  
>@@ -11,41 +11,15 @@
> -        OUTPUT_STRIP_TRAILING_WHITESPACE
> -    )
> -
>-     if(NOT MC_MYSQL_EMBEDDED_LIBRARIES)
>-         # At least on OpenSUSE --libmysql-libs doesn't exist, so we just use
>-         # MYSQL_LIBRARIES for that. We'll see if that's enough when testing
>-         # below.
>+-    if(NOT MC_MYSQL_EMBEDDED_LIBRARIES)
>+-        # At least on OpenSUSE --libmysql-libs doesn't exist, so we just use
>+-        # MYSQL_LIBRARIES for that. We'll see if that's enough when testing
>+-        # below.
> -        set(MYSQL_EMBEDDED_LIBRARIES ${MYSQL_LIBRARIES})
>-+        # mysql-config removed --libmysql-libs, but amarok need libmysqld other
>-+        # than libmysqlclient to run mysql embedded server.
>-+        find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld libmysqld
>-+            PATHS
>-+                $ENV{MYSQL_DIR}/libmysql_r/.libs
>-+                $ENV{MYSQL_DIR}/lib
>-+                $ENV{MYSQL_DIR}/lib/mysql
>-+            PATH_SUFFIXES
>-+                mysql
>-+        )
>-     else()
>-         set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES})
>-     endif()
>-@@ -51,7 +53,7 @@ endif()
>- # Try searching manually via find_path/find_library,  possibly with hints
>- # from pkg-config
>- find_package(PkgConfig)
>--pkg_check_modules(PC_MYSQL QUIET mysql mariadb)
>-+pkg_check_modules(PC_MYSQL QUIET mysql mariadb perconaserverclient)
>+-    else()
>+-        set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES})
>+-    endif()
>++    set(MYSQL_EMBEDDED_LIBRARIES "-L/usr/local/lib/mysql" -lmysqld -llz4)
>+ endif()
>  
>- find_path(MYSQL_INCLUDE_DIR mysql.h
>-     PATHS
>-@@ -101,6 +103,10 @@ if(MYSQL_EMBEDDED_LIBRARIES)
>-     #    string(STRIP ${_mysql_libs} _mysql_libs)
>-     #    set(MYSQL_EMBEDDED_LIBRARIES ${_mysql_libs})
>-     #endif()
>-+
>-+    string(CONCAT MC_MYSQL_LIBRARIES ${MYSQL_LIBRARIES} " -llz4")
>-+    string(STRIP ${MC_MYSQL_LIBRARIES} MC_MYSQL_LIBRARIES)
>-+    set(MYSQL_LIBRARIES ${MC_MYSQL_LIBRARIES})
>-     cmake_push_check_state()
>-     set(CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR})
>-     set(CMAKE_REQUIRED_LIBRARIES ${MYSQL_EMBEDDED_LIBRARIES})
>+ # Try searching manually via find_path/find_library,  possibly with hints
>diff --git a/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlestorage_CMakeLists.txt b/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlestorage_CMakeLists.txt
>deleted file mode 100644
>index b47f24e64ed9..000000000000
>--- a/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlestorage_CMakeLists.txt
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt.orig	2019-04-30 03:42:56 UTC
>-+++ src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt
>-@@ -25,6 +25,8 @@ target_link_libraries(amarok_storage-mysqlestorage
>-     ${MYSQL_EMBEDDED_LIBRARIES}
>-     ${CMAKE_DL_LIBS}
>-     ${ZLIB_LIBRARIES}
>-+    ${OPENSSL_SSL_LIBRARY}
>-+    ${OPENSSL_CRYPTO_LIBRARY}
>- )
>- 
>- if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "FreeBSD")
>diff --git a/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlserverstorage_CMakeLists.txt b/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlserverstorage_CMakeLists.txt
>deleted file mode 100644
>index e88c485be85a..000000000000
>--- a/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlserverstorage_CMakeLists.txt
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt.orig	2019-04-30 03:42:56 UTC
>-+++ src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt
>-@@ -25,6 +25,8 @@ target_link_libraries(amarok_storage-mysqlserverstorag
>-     ${MYSQL_LIBRARIES}
>-     ${CMAKE_DL_LIBS}
>-     ${ZLIB_LIBRARIES}
>-+    ${OPENSSL_SSL_LIBRARY}
>-+    ${OPENSSL_CRYPTO_LIBRARY}
>- )
>- 
>- if(NOT WIN32 AND NOT APPLE)
>diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
>index a7155ae0ebe7..6881b88d7382 100644
>--- a/audio/clementine-player/Makefile
>+++ b/audio/clementine-player/Makefile
>@@ -4,7 +4,7 @@
> PORTNAME=	clementine
> DISTVERSION=	1.3.1-661
> DISTVERSIONSUFFIX=	-g4ff370ce1
>-PORTREVISION=	6
>+PORTREVISION=	5
> CATEGORIES=	audio
> PKGNAMESUFFIX=	-player
> 
>diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
>index 8a6625cd534c..1b86e603dfb7 100644
>--- a/audio/mixxx/Makefile
>+++ b/audio/mixxx/Makefile
>@@ -4,7 +4,6 @@
> PORTNAME=	mixxx
> DISTVERSIONPREFIX=	release-
> DISTVERSION=	2.2.1
>-PORTREVISION=	1
> CATEGORIES=	audio
> 
> MAINTAINER=	acm@FreeBSD.org
>diff --git a/audio/mixxx21/Makefile b/audio/mixxx21/Makefile
>index 9d3772f50e50..5528e83d8667 100644
>--- a/audio/mixxx21/Makefile
>+++ b/audio/mixxx21/Makefile
>@@ -4,7 +4,6 @@
> PORTNAME=	mixxx
> DISTVERSIONPREFIX=	release-
> DISTVERSION=	2.1.8
>-PORTREVISION=	1
> CATEGORIES=	audio
> PKGNAMESUFFIX=  21
> 
>diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
>index 7c4bc6221210..591d56381415 100644
>--- a/audio/mumble/Makefile
>+++ b/audio/mumble/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mumble
> DISTVERSION=	1.3.0-rc1
>-PORTREVISION=	5
>+PORTREVISION=	4
> CATEGORIES=	audio
> 
> MAINTAINER=	feld@FreeBSD.org
>diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
>index 81e8da819b0e..04c388dc5ac0 100644
>--- a/audio/murmur/Makefile
>+++ b/audio/murmur/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	murmur
> DISTVERSION=	1.3.0-rc1
>-PORTREVISION=	5
>+PORTREVISION=	4
> CATEGORIES=	audio net
> 
> MAINTAINER=	feld@FreeBSD.org
>diff --git a/audio/supercollider/Makefile b/audio/supercollider/Makefile
>index a3ad702a479c..2e88d4253c3d 100644
>--- a/audio/supercollider/Makefile
>+++ b/audio/supercollider/Makefile
>@@ -1,12 +1,13 @@
> # $FreeBSD$
> 
> PORTNAME=	supercollider
>-DISTVERSION=	3.10.2
>+DISTVERSION=	3.9.3
>+PORTREVISION=	7
> CATEGORIES=	audio
> MASTER_SITES=	https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/
> DISTNAME=	SuperCollider-${PORTVERSION}-Source-linux
> 
>-MAINTAINER=	ports@nicandneal.net
>+MAINTAINER=	brittlehaus@gmail.com
> COMMENT=	Programming language for real time audio synthesis
> 
> LICENSE=	GPLv3
>@@ -23,7 +24,7 @@ USES=		cmake compiler:c++11-lang iconv localbase pkgconfig \
> 		qt:5 readline shared-mime-info tar:bzip2
> USE_QT=		buildtools_build concurrent core declarative gui linguisttools location \
> 		network opengl printsupport qmake_build sensors \
>-		sql widgets webengine websockets webchannel svg
>+		sql webkit widgets
> USE_XORG=	x11
> USE_LDCONFIG=	yes
> 
>@@ -53,14 +54,6 @@ SUPERNOVA_CMAKE_BOOL=	SUPERNOVA
> CMAKE_ARGS+=	-DSSE:BOOL=FALSE -DSSE2:BOOL=FALSE
> .endif
> 
>-.if ${OPSYS} == FreeBSD
>-.if (${OSVERSION} >= 1102507 && ${OSVERSION} < 1200000) || \
>-	(${OSVERSION} >= 1200506 && ${OSVERSION} < 1300000) || \
>-	${OSVERSION} >= 1300014
>-BROKEN=	fails to compile with Clang 8 due shipped Boost 1.66 libraries. Not compatible with Boost 1.70+, either
>-.endif
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's|MATCHES "Linux" AND|MATCHES "FreeBSD" AND|' \
> 		${WRKSRC}/CMakeLists.txt
>diff --git a/audio/supercollider/distinfo b/audio/supercollider/distinfo
>index 78c7826c068c..31650e76a9b9 100644
>--- a/audio/supercollider/distinfo
>+++ b/audio/supercollider/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1558424872
>-SHA256 (SuperCollider-3.10.2-Source-linux.tar.bz2) = 389a9b3ecad7907c31f97566a48a8b2c5c53b73a8ad8004f81a5e9cb9a0fdf7a
>-SIZE (SuperCollider-3.10.2-Source-linux.tar.bz2) = 11366481
>+TIMESTAMP = 1529769258
>+SHA256 (SuperCollider-3.9.3-Source-linux.tar.bz2) = b939964a93709d747711552d116fb935508d39ba3fb64e55a45b0210a8eb11b5
>+SIZE (SuperCollider-3.9.3-Source-linux.tar.bz2) = 11060240
>diff --git a/audio/supercollider/files/patch-external__libraries_CMakeLists.txt b/audio/supercollider/files/patch-external__libraries_CMakeLists.txt
>deleted file mode 100644
>index 00377b058916..000000000000
>--- a/audio/supercollider/files/patch-external__libraries_CMakeLists.txt
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- external_libraries/CMakeLists.txt.orig	2019-05-24 16:22:36.227027000 +0000
>-+++ external_libraries/CMakeLists.txt	2019-05-24 16:23:37.721453000 +0000
>-@@ -52,8 +52,10 @@
>- 	endif()
>- 
>- 
>--	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
>-+	if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
>- 		target_compile_options(boost_thread PRIVATE -fPIC)
>-+		target_compile_options(boost_system PRIVATE -fPIC)
>-+		target_compile_options(boost_filesystem PRIVATE -fPIC)
>- 		target_link_libraries(boost_thread rt)
>- 	endif()
>- 
>diff --git a/audio/supercollider/pkg-descr b/audio/supercollider/pkg-descr
>index f1e3d7f154fc..8de7a50bdf9b 100644
>--- a/audio/supercollider/pkg-descr
>+++ b/audio/supercollider/pkg-descr
>@@ -12,4 +12,4 @@ License in 2002 when he joined the Apple Core Audio team.  It is now
> maintained and developed by an active and enthusiastic community.  It
> is used by musicians, scientists, and artists working with sound.
> 
>-WWW: https://supercollider.github.io
>+WWW: http://supercollider.github.io/
>diff --git a/audio/supercollider/pkg-plist b/audio/supercollider/pkg-plist
>index 043558815256..10a537371dd5 100644
>--- a/audio/supercollider/pkg-plist
>+++ b/audio/supercollider/pkg-plist
>@@ -227,7 +227,6 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
> %%HELP%%share/SuperCollider/HelpSource/Classes/Crackle.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/CuspL.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/CuspN.schelp
>-%%HELP%%share/SuperCollider/HelpSource/Classes/CustomViewAction.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/DC.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Date.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Dbrown.schelp
>@@ -513,13 +512,10 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
> %%HELP%%share/SuperCollider/HelpSource/Classes/MIDIdef.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Magnitude.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Main.schelp
>-%%HELP%%share/SuperCollider/HelpSource/Classes/MainMenu.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/MantissaMask.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/MaxLocalBufs.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Maybe.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Median.schelp
>-%%HELP%%share/SuperCollider/HelpSource/Classes/Menu.schelp
>-%%HELP%%share/SuperCollider/HelpSource/Classes/MenuAction.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Message.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Method.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/MidEQ.schelp
>@@ -792,7 +788,6 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
> %%HELP%%share/SuperCollider/HelpSource/Classes/Pxrand.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/QPalette.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/QPenPrinter.schelp
>-%%HELP%%share/SuperCollider/HelpSource/Classes/QtGUI.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/QuadC.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/QuadL.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/QuadN.schelp
>@@ -896,6 +891,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
> %%HELP%%share/SuperCollider/HelpSource/Classes/SpecCentroid.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/SpecFlatness.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/SpecPcile.schelp
>+%%HELP%%share/SuperCollider/HelpSource/Classes/Speech.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Splay.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/SplayAz.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/SplayZ.schelp
>@@ -954,7 +950,6 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
> %%HELP%%share/SuperCollider/HelpSource/Classes/Thunk.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Timer.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/ToggleFF.schelp
>-%%HELP%%share/SuperCollider/HelpSource/Classes/ToolBar.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/TouchResponder.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/TreeView.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/TreeViewItem.schelp
>@@ -992,6 +987,7 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
> %%HELP%%share/SuperCollider/HelpSource/Classes/Wavetable.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/WebView.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/WhiteNoise.schelp
>+%%HELP%%share/SuperCollider/HelpSource/Classes/WiiMote.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Window.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/Wrap.schelp
> %%HELP%%share/SuperCollider/HelpSource/Classes/WrapIndex.schelp
>@@ -1024,7 +1020,6 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
> %%HELP%%share/SuperCollider/HelpSource/Guides/More-On-Getting-Help.schelp
> %%HELP%%share/SuperCollider/HelpSource/Guides/MultiClient_Setups.schelp
> %%HELP%%share/SuperCollider/HelpSource/Guides/Multichannel-Expansion.schelp
>-%%HELP%%share/SuperCollider/HelpSource/Guides/News-3_10.schelp
> %%HELP%%share/SuperCollider/HelpSource/Guides/News-3_5.schelp
> %%HELP%%share/SuperCollider/HelpSource/Guides/News-3_6.schelp
> %%HELP%%share/SuperCollider/HelpSource/Guides/News-3_7.schelp
>@@ -1044,7 +1039,6 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
> %%HELP%%share/SuperCollider/HelpSource/Guides/SuperColliderAU.schelp
> %%HELP%%share/SuperCollider/HelpSource/Guides/Sync-Async.schelp
> %%HELP%%share/SuperCollider/HelpSource/Guides/SynthDefsVsSynths.schelp
>-%%HELP%%share/SuperCollider/HelpSource/Guides/Tour-of-Special-Functions.schelp
> %%HELP%%share/SuperCollider/HelpSource/Guides/Tour_of_UGens.schelp
> %%HELP%%share/SuperCollider/HelpSource/Guides/Tracing-Processes.schelp
> %%HELP%%share/SuperCollider/HelpSource/Guides/UGens-and-Synths.schelp
>@@ -1239,7 +1233,6 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
> %%HELP%%share/SuperCollider/HelpSource/Tutorials/Mark_Polishook_tutorial/Japanese_version/13.schelp
> %%HELP%%share/SuperCollider/HelpSource/Tutorials/Mark_Polishook_tutorial/Japanese_version/14.schelp
> %%HELP%%share/SuperCollider/HelpSource/Tutorials/Mark_Polishook_tutorial/Japanese_version/15.schelp
>-%%HELP%%share/SuperCollider/HelpSource/Tutorials/Server_Tutorial.schelp
> %%HELP%%share/SuperCollider/HelpSource/Tutorials/Streams-Patterns-Events1.schelp
> %%HELP%%share/SuperCollider/HelpSource/Tutorials/Streams-Patterns-Events2.schelp
> %%HELP%%share/SuperCollider/HelpSource/Tutorials/Streams-Patterns-Events3.schelp
>@@ -1247,11 +1240,9 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
> %%HELP%%share/SuperCollider/HelpSource/Tutorials/Streams-Patterns-Events5.schelp
> %%HELP%%share/SuperCollider/HelpSource/Tutorials/Streams-Patterns-Events6.schelp
> %%HELP%%share/SuperCollider/HelpSource/Tutorials/Streams-Patterns-Events7.schelp
>+%%HELP%%share/SuperCollider/HelpSource/Tutorials/Tutorial.schelp
> %%HELP%%share/SuperCollider/HelpSource/browse.css
> %%HELP%%share/SuperCollider/HelpSource/browse.js
>-%%HELP%%share/SuperCollider/HelpSource/codemirror.css
>-%%HELP%%share/SuperCollider/HelpSource/editor.css
>-%%HELP%%share/SuperCollider/HelpSource/editor.js
> %%HELP%%share/SuperCollider/HelpSource/images/SC_icon.png
> %%HELP%%share/SuperCollider/HelpSource/images/Swamp.png
> %%HELP%%share/SuperCollider/HelpSource/images/duck_alpha.png
>@@ -1263,12 +1254,12 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
> %%HELP%%share/SuperCollider/HelpSource/images/plugin.svg
> %%HELP%%share/SuperCollider/HelpSource/images/vduck2.jpg
> %%HELP%%share/SuperCollider/HelpSource/images/vline.png
>-%%HELP%%share/SuperCollider/HelpSource/lib/codemirror-5.39.2.min.js
>-%%HELP%%share/SuperCollider/HelpSource/lib/codemirror-addon-simple-5.39.2.min.js
>-%%HELP%%share/SuperCollider/HelpSource/lib/jquery.min.js
>+%%HELP%%share/SuperCollider/HelpSource/lang-sc.js
>+%%HELP%%share/SuperCollider/HelpSource/prettify.js
> %%HELP%%share/SuperCollider/HelpSource/scdoc.css
> %%HELP%%share/SuperCollider/HelpSource/scdoc.js
> %%HELP%%share/SuperCollider/HelpSource/search.js
>+%%HELP%%share/SuperCollider/HelpSource/syntax_colors.html
> share/SuperCollider/README.md
> share/SuperCollider/README_LINUX.md
> share/SuperCollider/SCClassLibrary/Common/Audio/BEQSuite.sc
>@@ -1425,8 +1416,6 @@ share/SuperCollider/SCClassLibrary/Common/GUI/Base/EZgui.sc
> share/SuperCollider/SCClassLibrary/Common/GUI/Base/FlowLayout.sc
> share/SuperCollider/SCClassLibrary/Common/GUI/Base/Gradient.sc
> share/SuperCollider/SCClassLibrary/Common/GUI/Base/Grid.sc
>-share/SuperCollider/SCClassLibrary/Common/GUI/Base/Menu.sc
>-share/SuperCollider/SCClassLibrary/Common/GUI/Base/QCallback.sc
> share/SuperCollider/SCClassLibrary/Common/GUI/Base/QDialog.sc
> share/SuperCollider/SCClassLibrary/Common/GUI/Base/QEnvelopeView.sc
> share/SuperCollider/SCClassLibrary/Common/GUI/Base/QFont.sc
>@@ -1582,18 +1571,24 @@ share/SuperCollider/SCClassLibrary/SCDoc/SCDoc.sc
> share/SuperCollider/SCClassLibrary/SCDoc/SCDocRenderer.sc
> share/SuperCollider/SCClassLibrary/SCDoc/TODO
> share/SuperCollider/SCClassLibrary/backwards_compatibility/PMOsc.sc
>-share/SuperCollider/SCClassLibrary/deprecated/3.10/AudioIn.sc
>-share/SuperCollider/SCClassLibrary/deprecated/3.10/File.sc
>-share/SuperCollider/SCClassLibrary/deprecated/3.10/GUI/File.sc
>-share/SuperCollider/SCClassLibrary/deprecated/3.10/GUI/QWebView.sc
>-share/SuperCollider/SCClassLibrary/deprecated/3.10/deprecated-3.10.sc
>-share/SuperCollider/SCClassLibrary/deprecated/3.10/osc/OSCpathResponder.sc
>-share/SuperCollider/SCClassLibrary/deprecated/3.10/osc/OSCresponder.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/AudioIn.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/Donce.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/HistoryGui.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/InterplEnv.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/JITLib.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/TDuty_old.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/WII.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/Watcher.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/WiiMoteGUI.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/deprecated-3.9.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/osc/OSCpathResponder.sc
>+share/SuperCollider/SCClassLibrary/deprecated/3.9/osc/OSCresponder.sc
> share/SuperCollider/SCClassLibrary/scide_scqt/ScIDE.sc
> share/SuperCollider/examples/GUI examples/ColorBrowser.scd
> share/SuperCollider/examples/GUI examples/GUI_examples1.scd
> share/SuperCollider/examples/GUI examples/GUI_examples2.scd
> share/SuperCollider/examples/GUI examples/Nick's LetterGimmick.scd
>+share/SuperCollider/examples/GUI examples/ScopeExample.scd
> share/SuperCollider/examples/GUI examples/TwoMultiSlidersInOne.scd
> share/SuperCollider/examples/GUI examples/analog-drum-tuner.scd
> share/SuperCollider/examples/GUI examples/rotary hommage duchamp.scd
>@@ -1607,7 +1602,6 @@ share/SuperCollider/examples/demonstrations/DemandingStudies.scd
> share/SuperCollider/examples/demonstrations/DrumSynths.scd
> share/SuperCollider/examples/demonstrations/GetTheTwits.scd
> share/SuperCollider/examples/demonstrations/HarmonicsVoice.html
>-share/SuperCollider/examples/demonstrations/HarmonicsVoice.scd
> share/SuperCollider/examples/demonstrations/Modal Space.scd
> share/SuperCollider/examples/demonstrations/SC2-examples_1.scd
> share/SuperCollider/examples/demonstrations/SC2-examples_2.scd
>@@ -1620,7 +1614,7 @@ share/SuperCollider/examples/demonstrations/env automation.scd
> share/SuperCollider/examples/demonstrations/fft.scd
> share/SuperCollider/examples/demonstrations/more graphs.scd
> share/SuperCollider/examples/demonstrations/oh yes more fibs.scd
>-share/SuperCollider/examples/demonstrations/sc_oneliner.scd
>+share/SuperCollider/examples/demonstrations/sc_onliner.scd
> share/SuperCollider/examples/demonstrations/single_sample_feedback.scd
> share/SuperCollider/examples/demonstrations/single_sample_feedback_02.scd
> share/SuperCollider/examples/demonstrations/snare909.scd
>@@ -1628,7 +1622,6 @@ share/SuperCollider/examples/demonstrations/stealthissound.scd
> share/SuperCollider/examples/other/Exploring_SCLang.scd
> share/SuperCollider/examples/other/KeyboardWindow.scd
> share/SuperCollider/examples/other/keepyuppy.scd
>-share/SuperCollider/examples/other/onetwoonetwo.sc
> share/SuperCollider/examples/other/quines.scd
> share/SuperCollider/examples/pieces/DreamHouse.scd
> share/SuperCollider/examples/pieces/DrummerSynthDef.scd
>@@ -1665,6 +1658,7 @@ share/SuperCollider/translations/scide_ru.qm
> share/SuperCollider/translations/scide_sl.qm
> share/SuperCollider/translations/scide_sv.qm
> share/SuperCollider/translations/scide_zh.qm
>+share/doc/SuperCollider/examples/onetwoonetwo.sc
> share/mime/packages/supercollider.xml
> share/pixmaps/sc_ide.svg
> share/pixmaps/supercollider.png
>diff --git a/audio/zam-plugins-lv2/Makefile b/audio/zam-plugins-lv2/Makefile
>index 67b16f120776..8282bb5d903b 100644
>--- a/audio/zam-plugins-lv2/Makefile
>+++ b/audio/zam-plugins-lv2/Makefile
>@@ -37,8 +37,12 @@ post-extract:
> post-patch:
> 	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/dpf/utils/generate-ttl.sh
> .if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
>-	${REINPLACE_CMD} -e 's/-mtune=generic -msse -msse2//' \
>-		${WRKSRC}/dpf/Makefile.base.mk
>+	${REINPLACE_CMD} -e '/-mfpmath=sse/d' \
>+		-e 's/-mtune=generic -msse -msse2//' \
>+		${WRKSRC}/Makefile.mk ${WRKSRC}/Makefile.mk
>+	${REINPLACE_CMD} -e '/-mfpmath=sse/d' \
>+		-e 's/-mtune=generic -msse -msse2//' \
>+		${WRKSRC}/Makefile.mk ${WRKSRC}/dpf/dgl/Makefile.mk
> .endif
> 
> .include <bsd.port.post.mk>
>diff --git a/databases/cegobridge/Makefile b/databases/cegobridge/Makefile
>index d28801187496..a38ad387107d 100644
>--- a/databases/cegobridge/Makefile
>+++ b/databases/cegobridge/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cegobridge
>-PORTVERSION=	1.5.2
>+PORTVERSION=	1.5.1
> CATEGORIES=	databases
> MASTER_SITES=	http://www.lemke-it.com/
> 
>diff --git a/databases/cegobridge/distinfo b/databases/cegobridge/distinfo
>index ead81b783453..dacf2c948312 100644
>--- a/databases/cegobridge/distinfo
>+++ b/databases/cegobridge/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562399754
>-SHA256 (cegobridge-1.5.2.tar.gz) = f6f46f2dc1bb4ee2404b77f82797689c468be4eb1c13f280682a82ebb641779e
>-SIZE (cegobridge-1.5.2.tar.gz) = 699766
>+TIMESTAMP = 1562162345
>+SHA256 (cegobridge-1.5.1.tar.gz) = 08d3bd38fcc73f705e22a7e8c8d47be8e091a17f59e290a92578774404009e34
>+SIZE (cegobridge-1.5.1.tar.gz) = 699775
>diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile
>index 3deb5fff4f22..aceb37a35c5b 100644
>--- a/databases/clickhouse/Makefile
>+++ b/databases/clickhouse/Makefile
>@@ -5,7 +5,6 @@ PORTNAME=	clickhouse
> PORTVERSION=	19.5.3.8
> DISTVERSIONPREFIX=	v
> DISTVERSIONSUFFIX=	-stable
>-PORTREVISION=	1
> CATEGORIES=	databases
> 
> MAINTAINER=	proler@gmail.com
>diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
>index 38a3c9802347..e370d0f0c9c5 100644
>--- a/databases/mysql57-server/Makefile
>+++ b/databases/mysql57-server/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=	mysql
> PORTVERSION=	5.7.26
>-PORTREVISION?=	2
>+PORTREVISION?=	1
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.7
> PKGNAMESUFFIX?=	57-server
>diff --git a/databases/mysql57-server/files/patch-rapid-plugin-x-ngs-include-ngs_common-protocol_protobuf.h b/databases/mysql57-server/files/patch-rapid-plugin-x-ngs-include-ngs_common-protocol_protobuf.h
>deleted file mode 100644
>index 2ebc71bd239a..000000000000
>--- a/databases/mysql57-server/files/patch-rapid-plugin-x-ngs-include-ngs_common-protocol_protobuf.h
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h.orig	2019-04-13 13:32:15 UTC
>-+++ rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
>-@@ -29,7 +29,6 @@
>- #include <google/protobuf/io/tokenizer.h>
>- #include <google/protobuf/io/zero_copy_stream.h>
>- #include <google/protobuf/wire_format_lite.h>
>--#include <google/protobuf/wire_format_lite_inl.h>
>- #include <google/protobuf/dynamic_message.h>
>- 
>- #include "mysqlx_connection.pb.h"
>diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
>index ebf64b55cc70..2dc85ebafb18 100644
>--- a/databases/mysql80-server/Makefile
>+++ b/databases/mysql80-server/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=		mysql
> PORTVERSION=		8.0.16
>-PORTREVISION?=		1
>+PORTREVISION?=		0
> CATEGORIES=		databases ipv6
> MASTER_SITES=		MYSQL/MySQL-8.0
> PKGNAMESUFFIX?=		80-server
>diff --git a/databases/mysql80-server/files/patch-plugin-x-client-mysqlxclient-xmessage.h b/databases/mysql80-server/files/patch-plugin-x-client-mysqlxclient-xmessage.h
>deleted file mode 100644
>index 21adc2356d55..000000000000
>--- a/databases/mysql80-server/files/patch-plugin-x-client-mysqlxclient-xmessage.h
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- plugin/x/client/mysqlxclient/xmessage.h.orig	2019-04-13 11:46:31 UTC
>-+++ plugin/x/client/mysqlxclient/xmessage.h
>-@@ -36,7 +36,6 @@
>- #include <google/protobuf/repeated_field.h>
>- #include <google/protobuf/text_format.h>
>- #include <google/protobuf/wire_format_lite.h>
>--#include <google/protobuf/wire_format_lite_inl.h>
>- 
>- #ifdef USE_MYSQLX_FULL_PROTO
>- 
>diff --git a/databases/mysql80-server/files/patch-plugin-x-ngs-include-ngs-protocol-protocol_protobuf.h b/databases/mysql80-server/files/patch-plugin-x-ngs-include-ngs-protocol-protocol_protobuf.h
>deleted file mode 100644
>index 205fdceca301..000000000000
>--- a/databases/mysql80-server/files/patch-plugin-x-ngs-include-ngs-protocol-protocol_protobuf.h
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h.orig	2019-04-13 11:46:31 UTC
>-+++ plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h
>-@@ -38,7 +38,6 @@
>- #include <google/protobuf/repeated_field.h>
>- #include <google/protobuf/text_format.h>
>- #include <google/protobuf/wire_format_lite.h>
>--#include <google/protobuf/wire_format_lite_inl.h>
>- 
>- #ifdef USE_MYSQLX_FULL_PROTO
>- #include "plugin/x/generated/protobuf/mysqlx.pb.h"
>diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
>index e0ffced913f7..a78191d81449 100644
>--- a/databases/rrdtool/Makefile
>+++ b/databases/rrdtool/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	rrdtool
>-PORTVERSION=	1.7.2
>+PORTVERSION=	1.7.0
>+PORTREVISION=	2
> CATEGORIES=	databases graphics
> MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
> 
>@@ -19,7 +20,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
> USE_RC_SUBR=	rrdcached
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-USES=		gmake gnome libtool pathfix pkgconfig shebangfix
>+USES=		gmake libtool pathfix pkgconfig shebangfix
> USE_GNOME=	glib20 libxml2
> INSTALL_TARGET=	install-strip
> 
>@@ -45,6 +46,7 @@ GRAPH_CONFIGURE_OFF=	--disable-rrdcgi --disable-rrd_graph
> GRAPH_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
> 			libpng.so:graphics/png
> GRAPH_USE=		GNOME=cairo,pango
>+GRAPH_USES=		gnome
> MMAP_CONFIGURE_ENABLE=	mmap
> NLS_CONFIGURE_ENABLE=	nls
> NLS_USE=		GNOME=intltool
>diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
>index 4500a1f2c739..f59591a93f48 100644
>--- a/databases/rrdtool/distinfo
>+++ b/databases/rrdtool/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562346918
>-SHA256 (rrdtool-1.7.2.tar.gz) = a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
>-SIZE (rrdtool-1.7.2.tar.gz) = 2883737
>+TIMESTAMP = 1497920098
>+SHA256 (rrdtool-1.7.0.tar.gz) = f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b
>+SIZE (rrdtool-1.7.0.tar.gz) = 2849994
>diff --git a/databases/rrdtool/files/patch-configure b/databases/rrdtool/files/patch-configure
>index b56de23d32a7..32328d990c0b 100644
>--- a/databases/rrdtool/files/patch-configure
>+++ b/databases/rrdtool/files/patch-configure
>@@ -25,7 +25,7 @@
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: and out again" >&5
>  $as_echo "and out again" >&6; }
>  
>--echo $ECHO_N "ordering CD from https://tobi.oetiker.ch/wish $ECHO_C" 1>&6
>+-echo $ECHO_N "ordering CD from http://tobi.oetiker.ch/wish $ECHO_C" 1>&6
> -sleep 1
> -echo $ECHO_N ".$ECHO_C" 1>&6
> -sleep 1
>diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
>index 0a136782cd0e..742666e0753b 100644
>--- a/databases/rrdtool/pkg-plist
>+++ b/databases/rrdtool/pkg-plist
>@@ -10,7 +10,7 @@ include/rrd_format.h
> lib/librrd.a
> lib/librrd.so
> lib/librrd.so.8
>-lib/librrd.so.8.2.1
>+lib/librrd.so.8.1.0
> %%PERL%%%%SITE_PERL%%/RRDp.pm
> %%PERL%%%%SITE_ARCH%%/RRDs.pm
> %%PERL%%%%SITE_ARCH%%/auto/RRDs/RRDs.so
>@@ -24,7 +24,6 @@ libdata/pkgconfig/librrd.pc
> %%PORTDOCS%%man/man1/cdeftutorial.1.gz
> %%PORTDOCS%%man/man1/rpntutorial.1.gz
> %%PORTDOCS%%man/man1/rrd-beginners.1.gz
>-%%PORTDOCS%%man/man1/rrd_pdpcalc.1.gz
> %%PORTDOCS%%man/man1/rrdbuild.1.gz
> %%PORTDOCS%%man/man1/rrdcached.1.gz
> %%PORTDOCS%%man/man1/rrdcgi.1.gz
>@@ -59,7 +58,6 @@ libdata/pkgconfig/librrd.pc
> %%PORTDOCS%%%%DOCSDIR%%/html/librrd.html
> %%PORTDOCS%%%%DOCSDIR%%/html/rpntutorial.html
> %%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/rrd_pdpcalc.html
> %%PORTDOCS%%%%DOCSDIR%%/html/rrdbuild.html
> %%PORTDOCS%%%%DOCSDIR%%/html/rrdcached.html
> %%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html
>@@ -94,8 +92,6 @@ libdata/pkgconfig/librrd.pc
> %%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.txt
> %%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.pod
> %%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.txt
>-%%PORTDOCS%%%%DOCSDIR%%/txt/rrd_pdpcalc.pod
>-%%PORTDOCS%%%%DOCSDIR%%/txt/rrd_pdpcalc.txt
> %%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.pod
> %%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.txt
> %%PORTDOCS%%%%DOCSDIR%%/txt/rrdcached.pod
>@@ -146,5 +142,4 @@ libdata/pkgconfig/librrd.pc
> %%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.txt
> %%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.pod
> %%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.txt
>-%%NLS%%share/locale/fr/LC_MESSAGES/rrdtool.mo
> %%NLS%%share/locale/hu/LC_MESSAGES/rrdtool.mo
>diff --git a/deskutils/anydesk/Makefile b/deskutils/anydesk/Makefile
>index 64c303cca12f..d217d2712054 100644
>--- a/deskutils/anydesk/Makefile
>+++ b/deskutils/anydesk/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	anydesk
>-DISTVERSION=	5.1.0
>+DISTVERSION=	2.9.1
> CATEGORIES=	deskutils
> MASTER_SITES=	https://download.anydesk.com/freebsd/
> DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}-${ARCH:S/amd64/x86_64/:S/i386/i386/}
>@@ -16,17 +16,11 @@ LICENSE_PERMS=	auto-accept
> 
> ONLY_FOR_ARCHS=	amd64 i386
> 
>-LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
>-		libfreetype.so:print/freetype2 \
>-		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
>-		libinotify.so:devel/libinotify \
>-		libpolkit-gobject-1.so:sysutils/polkit
>+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
> 
>-USES=		gl gnome
>-
>-USE_GL=		gl glu
>-USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 pangox-compat
>-USE_XORG=	x11 xcb xdamage xext xfixes xi xrandr xrender xtst
>+USE_GL=		gl
>+USE_GNOME=	gtk20 glib20 gdkpixbuf2 cairo
>+USE_XORG=	x11 xi xcb xrandr xtst xext xfixes xdamage
> NO_BUILD=	YES
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>diff --git a/deskutils/anydesk/distinfo b/deskutils/anydesk/distinfo
>index 433e1804c7d5..03b5a822c57a 100644
>--- a/deskutils/anydesk/distinfo
>+++ b/deskutils/anydesk/distinfo
>@@ -1,3 +1,5 @@
>-TIMESTAMP = 1562435526
>-SHA256 (anydesk-freebsd-5.1.0-x86_64.tar.gz) = f5bf21e896f183391da64de4263ab186cdeab7ceaa9b9927dccca0a5d68f4c02
>-SIZE (anydesk-freebsd-5.1.0-x86_64.tar.gz) = 4280118
>+TIMESTAMP = 1521392807
>+SHA256 (anydesk-freebsd-2.9.1-x86_64.tar.gz) = aacc333b063b52f3f2b3c795a88003898faf51df733aa7c540c88db68bbdba69
>+SIZE (anydesk-freebsd-2.9.1-x86_64.tar.gz) = 2574053
>+SHA256 (anydesk-freebsd-2.9.1-i386.tar.gz) = 267abec3fb76af7436ed8ab43047d4988b923a1451da3b734aab873cbb1eb0f5
>+SIZE (anydesk-freebsd-2.9.1-i386.tar.gz) = 2418470
>diff --git a/deskutils/anydesk/pkg-descr b/deskutils/anydesk/pkg-descr
>index 66b1d0658e49..5abb168cf645 100644
>--- a/deskutils/anydesk/pkg-descr
>+++ b/deskutils/anydesk/pkg-descr
>@@ -1,6 +1,8 @@
>-AnyDesk is fast remote desktop which uses DeskRT to provide a considerably
>-better image quality and responsiveness than competing screensharing and remote
>-desktop products.  DeskRT is a new and innovative video codec specifically
>-designed for the transmission of image material from graphical user interfaces.
>+AnyDesk is fast remote desktop which uses DeskRT to provide
>+a considerably better image quality and responsiveness than
>+competing screensharing and remote desktop products.
>+DeskRT is a new and innovative video codec specifically
>+designed for the transmission of image material from
>+graphical user interfaces.
> 
> WWW: https://anydesk.com/remote-desktop
>diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile
>index 851153055262..89b2f7fe94b7 100644
>--- a/deskutils/nextcloudclient/Makefile
>+++ b/deskutils/nextcloudclient/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	nextcloudclient
>-PORTVERSION=	0.0.0.20190705
>+PORTVERSION=	0.0.0.20190207
> PORTREVISION=	2
> CATEGORIES=	deskutils
> 
>@@ -28,7 +28,7 @@ DEBUG=		yes
> USE_GITHUB=	yes
> GH_ACCOUNT=	nextcloud
> GH_PROJECT=	desktop
>-GH_TAGNAME=	c897564d28c04029f09dcce20078e9adb3b57518
>+GH_TAGNAME=	ca624def40d5e431bc84a157ffba1bc187d5ecee
> 
> #OPTIONS_DEFINE=		DEBUG DOCS
> OPTIONS_DEFINE=		DEBUG # DOCS doesn't build currently
>diff --git a/deskutils/nextcloudclient/distinfo b/deskutils/nextcloudclient/distinfo
>index 9636c93269da..8494c23a0381 100644
>--- a/deskutils/nextcloudclient/distinfo
>+++ b/deskutils/nextcloudclient/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562312299
>-SHA256 (nextcloud-desktop-0.0.0.20190705-c897564d28c04029f09dcce20078e9adb3b57518_GH0.tar.gz) = f79a60dd379d2e53efa43263be5eedef8aef03bd140cb4c116949993be96ee5d
>-SIZE (nextcloud-desktop-0.0.0.20190705-c897564d28c04029f09dcce20078e9adb3b57518_GH0.tar.gz) = 19097791
>+TIMESTAMP = 1549530153
>+SHA256 (nextcloud-desktop-0.0.0.20190207-ca624def40d5e431bc84a157ffba1bc187d5ecee_GH0.tar.gz) = 2945ee66c80dfa420bcd529c4764d6ed906cd0aff262467afb50e6803a0e74d9
>+SIZE (nextcloud-desktop-0.0.0.20190207-ca624def40d5e431bc84a157ffba1bc187d5ecee_GH0.tar.gz) = 18974468
>diff --git a/deskutils/nextcloudclient/pkg-plist b/deskutils/nextcloudclient/pkg-plist
>index 4895baf77447..1730a85037b9 100644
>--- a/deskutils/nextcloudclient/pkg-plist
>+++ b/deskutils/nextcloudclient/pkg-plist
>@@ -12,10 +12,10 @@ include/nextcloudsync/mirall/syncfileitem.h
> include/nextcloudsync/mirall/syncresult.h
> lib/libnextcloudsync.so
> lib/libnextcloudsync.so.0
>-lib/libnextcloudsync.so.2.5.3
>+lib/libnextcloudsync.so.2.5.2
> lib/nextcloud/libocsync.so
> lib/nextcloud/libocsync.so.0
>-lib/nextcloud/libocsync.so.2.5.3
>+lib/nextcloud/libocsync.so.2.5.2
> share/applications/nextcloud.desktop
> share/caja-python/extensions/syncstate-Nextcloud.py
> share/icons/hicolor/1024x1024/apps/Nextcloud.png
>@@ -89,7 +89,6 @@ share/nextcloud/i18n/client_TW.qm
> share/nextcloud/i18n/client_bg.qm
> share/nextcloud/i18n/client_ca.qm
> share/nextcloud/i18n/client_cs.qm
>-share/nextcloud/i18n/client_da.qm
> share/nextcloud/i18n/client_de.qm
> share/nextcloud/i18n/client_el.qm
> share/nextcloud/i18n/client_en.qm
>@@ -112,14 +111,11 @@ share/nextcloud/i18n/client_fa.qm
> share/nextcloud/i18n/client_fi.qm
> share/nextcloud/i18n/client_fr.qm
> share/nextcloud/i18n/client_gl.qm
>-share/nextcloud/i18n/client_he.qm
> share/nextcloud/i18n/client_hu.qm
>-share/nextcloud/i18n/client_id.qm
> share/nextcloud/i18n/client_is.qm
> share/nextcloud/i18n/client_it.qm
> share/nextcloud/i18n/client_ja.qm
> share/nextcloud/i18n/client_lt_LT.qm
>-share/nextcloud/i18n/client_lv.qm
> share/nextcloud/i18n/client_nb_NO.qm
> share/nextcloud/i18n/client_nl.qm
> share/nextcloud/i18n/client_pl.qm
>diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
>index 8a1c98e9e12d..540090d0b05e 100644
>--- a/deskutils/semantik/Makefile
>+++ b/deskutils/semantik/Makefile
>@@ -1,7 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	semantik
>-DISTVERSION=	1.2.2
>+DISTVERSION=	1.2.1
>+PORTREVISION=	1
> CATEGORIES=	deskutils kde
> MASTER_SITES=	https://waf.io/
> 
>diff --git a/deskutils/semantik/distinfo b/deskutils/semantik/distinfo
>index 9cba383b643b..eb15bc424aa3 100644
>--- a/deskutils/semantik/distinfo
>+++ b/deskutils/semantik/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562400272
>-SHA256 (semantik-1.2.2.tar.bz2) = 85d1316aac1c49b667608d032c09fec299e6c3f29be94f5ed911276601849e8a
>-SIZE (semantik-1.2.2.tar.bz2) = 618183
>+TIMESTAMP = 1546516843
>+SHA256 (semantik-1.2.1.tar.bz2) = 33901309d2127ba45e8e9c345729e9565eea7a45952b7bfdf22ef3838dfb0e84
>+SIZE (semantik-1.2.1.tar.bz2) = 617115
>diff --git a/devel/Makefile b/devel/Makefile
>index 986392e5c043..44e13a9c9f86 100644
>--- a/devel/Makefile
>+++ b/devel/Makefile
>@@ -32,7 +32,6 @@
>     SUBDIR += R-cran-crayon
>     SUBDIR += R-cran-data.table
>     SUBDIR += R-cran-doParallel
>-    SUBDIR += R-cran-ellipsis
>     SUBDIR += R-cran-evaluate
>     SUBDIR += R-cran-fansi
>     SUBDIR += R-cran-foreach
>@@ -957,7 +956,6 @@
>     SUBDIR += hs-mueval
>     SUBDIR += hs-old-locale
>     SUBDIR += hs-old-time
>-    SUBDIR += hs-profiteur
>     SUBDIR += hs-random
>     SUBDIR += hs-setlocale
>     SUBDIR += hs-shake
>diff --git a/devel/R-cran-ellipsis/Makefile b/devel/R-cran-ellipsis/Makefile
>deleted file mode 100644
>index cffc6e8e7a78..000000000000
>--- a/devel/R-cran-ellipsis/Makefile
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-# $FreeBSD$
>-
>-PORTNAME=	ellipsis
>-PORTVERSION=	0.2.0.1
>-CATEGORIES=	devel
>-DISTNAME=	${PORTNAME}_${PORTVERSION}
>-
>-MAINTAINER=	tota@FreeBSD.org
>-COMMENT=	Powerful tool for extending functions
>-
>-LICENSE=	GPLv3
>-
>-CRAN_DEPENDS=	R-cran-rlang>=0.3.0:devel/R-cran-rlang
>-BUILD_DEPENS=	${CRAN_DEPENDS}
>-RUN_DEPENDS=	${CRAN_DEPENDS}
>-
>-USES=		cran:auto-plist,compiles
>-
>-.include <bsd.port.mk>
>diff --git a/devel/R-cran-ellipsis/distinfo b/devel/R-cran-ellipsis/distinfo
>deleted file mode 100644
>index 2738d67d79e4..000000000000
>--- a/devel/R-cran-ellipsis/distinfo
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1562400004
>-SHA256 (ellipsis_0.2.0.1.tar.gz) = 0e6528c5e8016c3617cc1cfcdb5a4bfeb073e0bd5ea76b43e56b0c3208a0a943
>-SIZE (ellipsis_0.2.0.1.tar.gz) = 7045
>diff --git a/devel/R-cran-ellipsis/pkg-descr b/devel/R-cran-ellipsis/pkg-descr
>deleted file mode 100644
>index de4df83fe278..000000000000
>--- a/devel/R-cran-ellipsis/pkg-descr
>+++ /dev/null
>@@ -1,6 +0,0 @@
>-The ellipsis is a powerful tool for extending functions. Unfortunately
>-this power comes at a cost: misspelled arguments will be silently
>-ignored. The ellipsis package provides a collection of functions
>-to catch problems and alert the user.
>-
>-WWW: https://cran.r-project.org/web/packages/ellipsis/
>diff --git a/devel/R-cran-pillar/Makefile b/devel/R-cran-pillar/Makefile
>index a173ca361239..f2a1836d3361 100644
>--- a/devel/R-cran-pillar/Makefile
>+++ b/devel/R-cran-pillar/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	pillar
>-PORTVERSION=	1.4.2
>+PORTVERSION=	1.4.1
> CATEGORIES=	devel
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>diff --git a/devel/R-cran-pillar/distinfo b/devel/R-cran-pillar/distinfo
>index 4a5bf8b10942..9f853c3380fd 100644
>--- a/devel/R-cran-pillar/distinfo
>+++ b/devel/R-cran-pillar/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562396790
>-SHA256 (pillar_1.4.2.tar.gz) = bababb76b6db06dc32ccd947dbad6c164a1749ff5b558c6783ad03570f010825
>-SIZE (pillar_1.4.2.tar.gz) = 228815
>+TIMESTAMP = 1559472583
>+SHA256 (pillar_1.4.1.tar.gz) = f571ca7a3ef0927747510b972da31a26da24b9da68990fe1bbc9d4ae58028c55
>+SIZE (pillar_1.4.1.tar.gz) = 228572
>diff --git a/devel/R-cran-rlang/Makefile b/devel/R-cran-rlang/Makefile
>index 6988a86c3dd0..bd84478a3065 100644
>--- a/devel/R-cran-rlang/Makefile
>+++ b/devel/R-cran-rlang/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	rlang
>-PORTVERSION=	0.4.0
>+PORTVERSION=	0.3.4
> CATEGORIES=	devel
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>diff --git a/devel/R-cran-rlang/distinfo b/devel/R-cran-rlang/distinfo
>index 8afdd2decd47..1fe9b09e36dd 100644
>--- a/devel/R-cran-rlang/distinfo
>+++ b/devel/R-cran-rlang/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562401604
>-SHA256 (rlang_0.4.0.tar.gz) = 9748a4a217548bbe5631c18fd88c94811950446f798ff21fb327703aebaa150d
>-SIZE (rlang_0.4.0.tar.gz) = 859737
>+TIMESTAMP = 1558823651
>+SHA256 (rlang_0.3.4.tar.gz) = 4e467f7b0dcbde91b60c292137d2c69cecaa713a6e4c9b7157ef6fd5453b7ade
>+SIZE (rlang_0.3.4.tar.gz) = 858992
>diff --git a/devel/R-cran-rngtools/Makefile b/devel/R-cran-rngtools/Makefile
>index 1bdf4002b4c8..e7ec1347c513 100644
>--- a/devel/R-cran-rngtools/Makefile
>+++ b/devel/R-cran-rngtools/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	rngtools
>-PORTVERSION=	1.4
>+PORTVERSION=	1.3.1.1
> CATEGORIES=	devel
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>diff --git a/devel/R-cran-rngtools/distinfo b/devel/R-cran-rngtools/distinfo
>index a12dd7db5937..551ac037da3f 100644
>--- a/devel/R-cran-rngtools/distinfo
>+++ b/devel/R-cran-rngtools/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562401829
>-SHA256 (rngtools_1.4.tar.gz) = 3aa92366e5d0500537964302f5754a750aff6b169a27611725e7d84552913bce
>-SIZE (rngtools_1.4.tar.gz) = 20525
>+TIMESTAMP = 1560092242
>+SHA256 (rngtools_1.3.1.1.tar.gz) = 99e1a8fde6b81128d0946746c1ef84ec5b6c2973ad843a080098baf73aa3364c
>+SIZE (rngtools_1.3.1.1.tar.gz) = 19449
>diff --git a/devel/R-cran-vctrs/Makefile b/devel/R-cran-vctrs/Makefile
>index 78ec96994f17..a168889fa310 100644
>--- a/devel/R-cran-vctrs/Makefile
>+++ b/devel/R-cran-vctrs/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	vctrs
>-PORTVERSION=	0.2.0
>+PORTVERSION=	0.1.0
> CATEGORIES=	devel
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>@@ -10,15 +10,14 @@ COMMENT=	Vector Helpers
> 
> LICENSE=	GPLv3
> 
>+USES=		cran:auto-plist,compiles
>+
> CRAN_DEPENDS=	R-cran-backports>0:math/R-cran-backports \
>-		R-cran-ellipsis>=0.2.0:devel/R-cran-ellipsis \
> 		R-cran-digest>0:security/R-cran-digest \
> 		R-cran-glue>0:devel/R-cran-glue \
>-		R-cran-rlang>=0.4.0:devel/R-cran-rlang \
>+		R-cran-rlang>0:devel/R-cran-rlang \
> 		R-cran-zeallot>0:devel/R-cran-zeallot
> BUILD_DEPENDS=	${CRAN_DEPENDS}
> RUN_DEPENDS=	${CRAN_DEPENDS}
> 
>-USES=		cran:auto-plist,compiles
>-
> .include <bsd.port.mk>
>diff --git a/devel/R-cran-vctrs/distinfo b/devel/R-cran-vctrs/distinfo
>index 7895c56a321b..5862e3b68f16 100644
>--- a/devel/R-cran-vctrs/distinfo
>+++ b/devel/R-cran-vctrs/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562399681
>-SHA256 (vctrs_0.2.0.tar.gz) = 5bce8f228182ecaa51230d00ad8a018de9cf2579703e82244e0931fe31f20016
>-SIZE (vctrs_0.2.0.tar.gz) = 668258
>+TIMESTAMP = 1560084214
>+SHA256 (vctrs_0.1.0.tar.gz) = cc28febd74b4c7800076ac4d2c628755125981bdd3ebf295bb3952753fca818f
>+SIZE (vctrs_0.1.0.tar.gz) = 412633
>diff --git a/devel/binaryen/Makefile b/devel/binaryen/Makefile
>index ebccc1c4e60f..7039da4a7b44 100644
>--- a/devel/binaryen/Makefile
>+++ b/devel/binaryen/Makefile
>@@ -1,7 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	binaryen
>-DISTVERSION=	1.38.32
>+DISTVERSION=	1.38.8
>+PORTREVISION=	2
> CATEGORIES=	devel
> 
> MAINTAINER=	greg@unrelenting.technology
>diff --git a/devel/binaryen/distinfo b/devel/binaryen/distinfo
>index 2adcf2e82b66..d3a1c6f88837 100644
>--- a/devel/binaryen/distinfo
>+++ b/devel/binaryen/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562265330
>-SHA256 (WebAssembly-binaryen-1.38.32_GH0.tar.gz) = 519b1dae68b110dd3c514edcdd2991d4c3693082bb06ac525724a5875bb7bdbf
>-SIZE (WebAssembly-binaryen-1.38.32_GH0.tar.gz) = 2862531
>+TIMESTAMP = 1531420185
>+SHA256 (WebAssembly-binaryen-1.38.8_GH0.tar.gz) = 7efc8fcee0cebbe7e95258d3e26da244dfb51774bedede4fe9d58dc601f9d137
>+SIZE (WebAssembly-binaryen-1.38.8_GH0.tar.gz) = 3493264
>diff --git a/devel/binaryen/pkg-plist b/devel/binaryen/pkg-plist
>index 1ca030782aff..14d8289a9335 100644
>--- a/devel/binaryen/pkg-plist
>+++ b/devel/binaryen/pkg-plist
>@@ -3,10 +3,12 @@ bin/wasm-as
> bin/wasm-ctor-eval
> bin/wasm-dis
> bin/wasm-emscripten-finalize
>+bin/wasm-merge
> bin/wasm-metadce
> bin/wasm-opt
> bin/wasm-reduce
> bin/wasm-shell
>-bin/wasm2js
>+bin/wasm2asm
> include/binaryen-c.h
> lib/libbinaryen.so
>+%%DATADIR%%/wasm.js
>diff --git a/devel/bloaty/Makefile b/devel/bloaty/Makefile
>index b712e126ccb9..cc15251100f9 100644
>--- a/devel/bloaty/Makefile
>+++ b/devel/bloaty/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	bloaty
> PORTVERSION=	1.0
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	2
>+PORTREVISION=	1
> CATEGORIES=	devel
> 
> MAINTAINER=	swills@FreeBSD.org
>diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
>index 6bbdce16a1db..23a17003303a 100644
>--- a/devel/gitg/Makefile
>+++ b/devel/gitg/Makefile
>@@ -2,10 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	gitg
>-PORTVERSION=	3.32.0
>+PORTVERSION=	3.30.1
>+PORTREVISION=	2
> CATEGORIES=	devel deskutils gnome
> MASTER_SITES=	GNOME
>-DIST_SUBDIR=	gnome
>+DIST_SUBDIR=	gnome3
> 
> MAINTAINER=	kwm@FreeBSD.org
> COMMENT=	GTK-based git repository viewer
>@@ -22,7 +23,6 @@ LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
> 		libgit2-glib-1.0.so:devel/libgit2-glib \
> 		libpeas-1.0.so:devel/libpeas \
> 		libgtkspell3-3.so:textproc/gtkspell3 \
>-		libdazzle-1.0.so:x11-toolkits/libdazzle \
> 		libsecret-1.so:security/libsecret
> RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
> 
>diff --git a/devel/gitg/distinfo b/devel/gitg/distinfo
>index 697ede329ce8..58632bad67ec 100644
>--- a/devel/gitg/distinfo
>+++ b/devel/gitg/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1558695574
>-SHA256 (gnome/gitg-3.32.0.tar.xz) = 01d9b5ac385b383f3060c5d0b8c6cd7ef6b4d6bf13a2911c385c2800d7d9faf3
>-SIZE (gnome/gitg-3.32.0.tar.xz) = 10613356
>+TIMESTAMP = 1543786956
>+SHA256 (gnome3/gitg-3.30.1.tar.xz) = 5a0b9b44aa3b67f6376c8e91e41e750cfaf53780b26da50139d3501c55c0e8bb
>+SIZE (gnome3/gitg-3.30.1.tar.xz) = 10555888
>diff --git a/devel/gitg/files/patch-libgitg_gitg-diff-view-commit-details.vala b/devel/gitg/files/patch-libgitg_gitg-diff-view-commit-details.vala
>deleted file mode 100644
>index 1b8e84d1b8bb..000000000000
>--- a/devel/gitg/files/patch-libgitg_gitg-diff-view-commit-details.vala
>+++ /dev/null
>@@ -1,117 +0,0 @@
>-https://gitlab.gnome.org/GNOME/gitg/issues/213
>-https://gitlab.gnome.org/GNOME/gitg/merge_requests/83
>-
>---- libgitg/gitg-diff-view-commit-details.vala.orig	2019-05-23 11:02:37 UTC
>-+++ libgitg/gitg-diff-view-commit-details.vala
>-@@ -281,65 +281,69 @@ class Gitg.DiffViewCommitDetails : Gtk.Grid
>- 
>- 	private string parse_ini_file(string subject_text)
>- 	{
>--		string result = subject_text.dup();
>--		GLib.KeyFile file = new GLib.KeyFile();
>--
>--		try
>-+		string result = subject_text;
>-+		if (config_file!=null)
>- 		{
>--			debug ("parsing %s", config_file);
>--			if (file.load_from_file(config_file , GLib.KeyFileFlags.NONE))
>-+			try
>- 			{
>--				foreach (string group in file.get_groups())
>-+				debug ("parsing %s", config_file);
>-+				GLib.KeyFile file = new GLib.KeyFile();
>-+				if (file.load_from_file(config_file , GLib.KeyFileFlags.NONE))
>- 				{
>--					if (group.has_prefix("gitg.custom-link"))
>-+					result = subject_text.dup();
>-+					foreach (string group in file.get_groups())
>- 					{
>--						string custom_link_regexp = file.get_string (group, "regexp");
>--						string custom_link_replacement = file.get_string (group, "replacement");
>--						debug ("found group: %s", custom_link_regexp);
>--						bool custom_color = file.has_key (group, "color");
>--						string color = null;
>--						if (custom_color)
>-+						if (group.has_prefix("gitg.custom-link"))
>- 						{
>--							string custom_link_color = file.get_string (group, "color");
>--							color = custom_link_color;
>--						}
>-+							string custom_link_regexp = file.get_string (group, "regexp");
>-+							string custom_link_replacement = file.get_string (group, "replacement");
>-+							debug ("found group: %s", custom_link_regexp);
>-+							bool custom_color = file.has_key (group, "color");
>-+							string color = null;
>-+							if (custom_color)
>-+							{
>-+								string custom_link_color = file.get_string (group, "color");
>-+								color = custom_link_color;
>-+							}
>- 
>--						var custom_regex = new Regex (custom_link_regexp);
>--						try
>--						{
>--							GLib.MatchInfo matchInfo;
>-+							var custom_regex = new Regex (custom_link_regexp);
>-+							try
>-+							{
>-+								GLib.MatchInfo matchInfo;
>- 
>--							custom_regex.match (subject_text, 0, out matchInfo);
>-+								custom_regex.match (subject_text, 0, out matchInfo);
>- 
>--							while (matchInfo.matches ())
>--							{
>--								string text = matchInfo.fetch(0);
>--								string link = text.dup();
>--								debug ("found: %s", link);
>--								if (custom_link_replacement != null)
>-+								while (matchInfo.matches ())
>- 								{
>--									link = custom_regex.replace(link, text.length, 0, custom_link_replacement);
>--								}
>--								if (color != null) {
>--									result = result.replace(text, "<a href=\"%s\" title=\"%s\" style=\"color:%s\">%s</a>".printf(link, link, color, text));
>--								} else {
>--									result = result.replace(text, "<a href=\"%s\" title=\"%s\">%s</a>".printf(link, link, text));
>--								}
>-+									string text = matchInfo.fetch(0);
>-+									string link = text.dup();
>-+									debug ("found: %s", link);
>-+									if (custom_link_replacement != null)
>-+									{
>-+										link = custom_regex.replace(link, text.length, 0, custom_link_replacement);
>-+									}
>-+									if (color != null) {
>-+										result = result.replace(text, "<a href=\"%s\" title=\"%s\" style=\"color:%s\">%s</a>".printf(link, link, color, text));
>-+									} else {
>-+										result = result.replace(text, "<a href=\"%s\" title=\"%s\">%s</a>".printf(link, link, text));
>-+									}
>- 
>--								matchInfo.next();
>-+									matchInfo.next();
>-+								}
>- 							}
>-+							catch(Error e)
>-+							{
>-+							}
>- 						}
>--						catch(Error e)
>--						{
>--						}
>- 					}
>- 				}
>-+			} catch (Error e)
>-+			{
>-+				warning ("Cannot read %s %s", config_file, e.message);
>- 			}
>--		} catch (Error e)
>--		{
>--			warning ("Cannot read %s %s", config_file, e.message);
>- 		}
>- 		return result;
>-+
>- 	}
>- 
>- 	private void update_avatar()
>diff --git a/devel/gitg/files/patch-libgitg_gitg-diff-view.vala b/devel/gitg/files/patch-libgitg_gitg-diff-view.vala
>deleted file mode 100644
>index 9d31308a3fe8..000000000000
>--- a/devel/gitg/files/patch-libgitg_gitg-diff-view.vala
>+++ /dev/null
>@@ -1,75 +0,0 @@
>-https://gitlab.gnome.org/GNOME/gitg/issues/213
>-https://gitlab.gnome.org/GNOME/gitg/merge_requests/83
>-
>---- libgitg/gitg-diff-view.vala.orig	2019-05-23 11:02:37 UTC
>-+++ libgitg/gitg-diff-view.vala
>-@@ -131,8 +131,11 @@ public class Gitg.DiffView : Gtk.Grid
>- 		get { return d_repository; }
>- 		set {
>- 			d_repository = value;
>--			config_file = "%s/.git/config".printf(d_repository.get_workdir().get_path());
>--			d_commit_details.config_file = config_file;
>-+			if (d_repository!=null)
>-+			{
>-+				config_file = "%s/.git/config".printf(d_repository.get_workdir().get_path());
>-+				d_commit_details.config_file = config_file;
>-+			}
>- 		}
>- 	}
>- 	public bool new_is_workdir { get; set; }
>-@@ -593,34 +596,37 @@ public class Gitg.DiffView : Gtk.Grid
>- 
>- 	private void read_ini_file(Gtk.TextBuffer buffer)
>- 	{
>--		GLib.KeyFile file = new GLib.KeyFile();
>--
>--		try
>-+		if (config_file != null)
>- 		{
>--			if (file.load_from_file(config_file , GLib.KeyFileFlags.NONE))
>-+			try
>- 			{
>--				foreach (string group in file.get_groups())
>-+				GLib.KeyFile file = new GLib.KeyFile();
>-+				if (file.load_from_file(config_file , GLib.KeyFileFlags.NONE))
>- 				{
>--					if (group.has_prefix("gitg.custom-link"))
>-+					foreach (string group in file.get_groups())
>- 					{
>--						string custom_link_regexp = file.get_string (group, "regexp");
>--						string custom_link_replacement = file.get_string (group, "replacement");
>--						bool custom_color = file.has_key (group, "color");
>--						Gdk.RGBA color = d_color_link;
>--						if (custom_color)
>-+						if (group.has_prefix("gitg.custom-link"))
>- 						{
>--							string custom_link_color = file.get_string (group, "color");
>--							color = Gdk.RGBA();
>--							color.parse(custom_link_color);
>-+							string custom_link_regexp = file.get_string (group, "regexp");
>-+							string custom_link_replacement = file.get_string (group, "replacement");
>-+							bool custom_color = file.has_key (group, "color");
>-+							Gdk.RGBA color = d_color_link;
>-+							if (custom_color)
>-+							{
>-+								string custom_link_color = file.get_string (group, "color");
>-+								color = Gdk.RGBA();
>-+								color.parse(custom_link_color);
>-+							}
>-+							apply_link_tags(buffer, new Regex (custom_link_regexp), custom_link_replacement, color, custom_color, true);
>- 						}
>--						apply_link_tags(buffer, new Regex (custom_link_regexp), custom_link_replacement, color, custom_color, true);
>- 					}
>- 				}
>-+			} catch (Error e)
>-+			{
>-+				warning ("Cannot read %s: %s", config_file, e.message);
>- 			}
>--		} catch (Error e)
>--		{
>--			warning ("Cannot read %s: %s", config_file, e.message);
>- 		}
>-+
>- 	}
>- 
>- 	private void auto_change_expanded(bool expanded)
>diff --git a/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala b/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala
>index ac08636bcf31..40ecbbe18922 100644
>--- a/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala
>+++ b/devel/gitg/files/patch-libgitg_gitg-repository-list-box.vala
>@@ -1,8 +1,7 @@
>-https://gitlab.gnome.org/GNOME/gitg/issues/213
>-https://gitlab.gnome.org/GNOME/gitg/merge_requests/83
>-
>-
>---- libgitg/gitg-repository-list-box.vala.orig	2019-05-23 11:02:37 UTC
>+# gitg crash on exit if built with -fstack-protector-all
>+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234607
>+# https://gitlab.gnome.org/GNOME/gitg/issues/171
>+--- libgitg/gitg-repository-list-box.vala
> +++ libgitg/gitg-repository-list-box.vala
> @@ -407,9 +407,12 @@ namespace Gitg
>  			return ((Row)b).time.compare(((Row)a).time);
>diff --git a/devel/gitg/pkg-plist b/devel/gitg/pkg-plist
>index 0da7dce8927e..e75ed632f3a5 100644
>--- a/devel/gitg/pkg-plist
>+++ b/devel/gitg/pkg-plist
>@@ -1,6 +1,4 @@
> bin/gitg
>-include/libgitg-1.0/libgitg/libgitg.h
>-include/libgitg-ext-1.0/libgitg-ext/libgitg-ext.h
> lib/girepository-1.0/Gitg-1.0.typelib
> lib/girepository-1.0/GitgExt-1.0.typelib
> lib/gitg/plugins/diff.plugin
>@@ -18,18 +16,16 @@ lib/libgitg-ext-1.0.so.0.0.0
> libdata/pkgconfig/libgitg-1.0.pc
> libdata/pkgconfig/libgitg-ext-1.0.pc
> man/man1/gitg.1.gz
>-share/applications/org.gnome.gitg.desktop
>-share/gir-1.0/Gitg-1.0.gir
>-share/gir-1.0/GitgExt-1.0.gir
>+share/applications/gitg.desktop
> %%DATADIR%%/icons/hicolor/scalable/actions/diff-symbolic.svg
> share/glade/catalogs/gitg-glade.xml
>-share/icons/hicolor/16x16/apps/org.gnome.gitg.png
>-share/icons/hicolor/22x22/apps/org.gnome.gitg.png
>-share/icons/hicolor/24x24/apps/org.gnome.gitg.png
>-share/icons/hicolor/256x256/apps/org.gnome.gitg.png
>-share/icons/hicolor/32x32/apps/org.gnome.gitg.png
>-share/icons/hicolor/48x48/apps/org.gnome.gitg.png
>-share/icons/hicolor/scalable/apps/org.gnome.gitg-symbolic.svg
>+share/icons/hicolor/16x16/apps/gitg.png
>+share/icons/hicolor/22x22/apps/gitg.png
>+share/icons/hicolor/24x24/apps/gitg.png
>+share/icons/hicolor/256x256/apps/gitg.png
>+share/icons/hicolor/32x32/apps/gitg.png
>+share/icons/hicolor/48x48/apps/gitg.png
>+share/icons/hicolor/scalable/apps/gitg-symbolic.svg
> share/locale/as/LC_MESSAGES/gitg.mo
> share/locale/bg/LC_MESSAGES/gitg.mo
> share/locale/bs/LC_MESSAGES/gitg.mo
>@@ -78,6 +74,4 @@ share/locale/vi/LC_MESSAGES/gitg.mo
> share/locale/zh_CN/LC_MESSAGES/gitg.mo
> share/locale/zh_HK/LC_MESSAGES/gitg.mo
> share/locale/zh_TW/LC_MESSAGES/gitg.mo
>-share/metainfo/org.gnome.gitg.appdata.xml
>-share/vala/vapi/libgitg-1.0.vapi
>-share/vala/vapi/libgitg-ext-1.0.vapi
>+share/metainfo/gitg.appdata.xml
>diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
>index c99e9edd4fc8..e710e0effd5b 100644
>--- a/devel/grpc/Makefile
>+++ b/devel/grpc/Makefile
>@@ -4,7 +4,6 @@
> PORTNAME=	grpc
> PORTVERSION=	1.19.1
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	devel
> 
>diff --git a/devel/hs-profiteur/Makefile b/devel/hs-profiteur/Makefile
>deleted file mode 100644
>index 367fd0892874..000000000000
>--- a/devel/hs-profiteur/Makefile
>+++ /dev/null
>@@ -1,29 +0,0 @@
>-# $FreeBSD$
>-
>-PORTNAME=	profiteur
>-PORTVERSION=	0.4.5.1
>-PORTREVISION=	1
>-CATEGORIES=	devel haskell
>-
>-MAINTAINER=	haskell@FreeBSD.org
>-COMMENT=	Treemap visualiser for GHC .prof files
>-
>-LICENSE=	BSD3CLAUSE
>-
>-USES=		cabal
>-
>-USE_CABAL=	aeson-1.4.4.0 attoparsec-0.13.2.2 base-compat-0.10.5 \
>-		base-orphans-0.8.1 dlist-0.8.0.6 ghc-prof-1.4.1.5 \
>-		hashable-1.3.0.0 integer-logarithms-1.0.3 js-jquery-3.3.1 \
>-		primitive-0.7.0.0 random-1.1 scientific-0.3.6.2 tagged-0.8.6 \
>-		th-abstraction-0.3.1.0 time-compat-1.9.2.2 \
>-		unordered-containers-0.2.10.0_1 uuid-types-1.0.3_2 \
>-		vector-0.12.0.3
>-
>-profiteur_DATADIR_VARS=		js-jquery
>-
>-post-install:
>-	cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}
>-	${INSTALL_DATA} ${WRKSRC}/js-jquery-3.3.1/javascript/jquery-3.3.1.min.js ${STAGEDIR}${DATADIR}
>-
>-.include <bsd.port.mk>
>diff --git a/devel/hs-profiteur/distinfo b/devel/hs-profiteur/distinfo
>deleted file mode 100644
>index 39a81675c7af..000000000000
>--- a/devel/hs-profiteur/distinfo
>+++ /dev/null
>@@ -1,43 +0,0 @@
>-TIMESTAMP = 1562432691
>-SHA256 (cabal/profiteur-0.4.5.1.tar.gz) = 00754cf597ea69b05f5f0928aee27c6d04c2f0c7bc031cdfcc82ec91a8720257
>-SIZE (cabal/profiteur-0.4.5.1.tar.gz) = 12275
>-SHA256 (cabal/aeson-1.4.4.0/aeson-1.4.4.0.tar.gz) = 17c67cdaca651e18f310b21b2b12bac6bcec5188c3ac0e4b64cc60c94d7e4d2e
>-SIZE (cabal/aeson-1.4.4.0/aeson-1.4.4.0.tar.gz) = 279980
>-SHA256 (cabal/attoparsec-0.13.2.2/attoparsec-0.13.2.2.tar.gz) = dd93471eb969172cc4408222a3842d867adda3dd7fb39ad8a4df1b121a67d848
>-SIZE (cabal/attoparsec-0.13.2.2/attoparsec-0.13.2.2.tar.gz) = 159729
>-SHA256 (cabal/base-compat-0.10.5/base-compat-0.10.5.tar.gz) = 990aea21568956d44ab018c5dbfbaea014b9a0d5295d29ca7550149419a6fb41
>-SIZE (cabal/base-compat-0.10.5/base-compat-0.10.5.tar.gz) = 33158
>-SHA256 (cabal/base-orphans-0.8.1/base-orphans-0.8.1.tar.gz) = 442bd63aed102e753b2fed15df8ae19f35ee07af26590da63837c523b64a99db
>-SIZE (cabal/base-orphans-0.8.1/base-orphans-0.8.1.tar.gz) = 19639
>-SHA256 (cabal/dlist-0.8.0.6/dlist-0.8.0.6.tar.gz) = 780b4ac91d6e88e77ebf1629568bddd45959b8e0cd295b17c7d55d835c03c73f
>-SIZE (cabal/dlist-0.8.0.6/dlist-0.8.0.6.tar.gz) = 9057
>-SHA256 (cabal/ghc-prof-1.4.1.5/ghc-prof-1.4.1.5.tar.gz) = e42d1acd9947c1396adcf1ae3a0627144884af5cf13176fb09cce0e9bcfbfe32
>-SIZE (cabal/ghc-prof-1.4.1.5/ghc-prof-1.4.1.5.tar.gz) = 10890
>-SHA256 (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4
>-SIZE (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 29835
>-SHA256 (cabal/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz) = 5ae262018698af35bb74916fad170d96d3eb44669c72ed36db9a19a3392cec16
>-SIZE (cabal/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz) = 8840
>-SHA256 (cabal/js-jquery-3.3.1/js-jquery-3.3.1.tar.gz) = e0e0681f0da1130ede4e03a051630ea439c458cb97216cdb01771ebdbe44069b
>-SIZE (cabal/js-jquery-3.3.1/js-jquery-3.3.1.tar.gz) = 114431
>-SHA256 (cabal/primitive-0.7.0.0/primitive-0.7.0.0.tar.gz) = 786a44fea328caf704b762ebc887e9e8476c4378fdf3a06c94e86ef1878d1576
>-SIZE (cabal/primitive-0.7.0.0/primitive-0.7.0.0.tar.gz) = 66014
>-SHA256 (cabal/random-1.1/random-1.1.tar.gz) = b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a
>-SIZE (cabal/random-1.1/random-1.1.tar.gz) = 10870
>-SHA256 (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 278d0afc87450254f8a76eab21b5583af63954efc9b74844a17a21a68013140f
>-SIZE (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 23510
>-SHA256 (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = ad16def0884cf6f05ae1ae8e90192cf9d8d9673fa264b249499bd9e4fac791dd
>-SIZE (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = 11759
>-SHA256 (cabal/th-abstraction-0.3.1.0/th-abstraction-0.3.1.0.tar.gz) = 4b9e1bcc6ec3d897fb09c3d7fa2f37f0672d5370e0e3e49809886da81fe001b9
>-SIZE (cabal/th-abstraction-0.3.1.0/th-abstraction-0.3.1.0.tar.gz) = 34248
>-SHA256 (cabal/time-compat-1.9.2.2/time-compat-1.9.2.2.tar.gz) = a268613385d359274edf48fb2dad4af29874f58486b2d5625e3b95a371066a17
>-SIZE (cabal/time-compat-1.9.2.2/time-compat-1.9.2.2.tar.gz) = 49652
>-SHA256 (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 65f117bdbdea9efc75fb9fd539873de7687e005d8898bb21821020a4b383c573
>-SIZE (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 44733
>-SHA256 (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204
>-SIZE (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5199
>-SHA256 (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 9276517ab24a9b06f39d6e3c33c6c2b4ace1fc2126dbc1cd9806866a6551b3fd
>-SIZE (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 11999
>-SHA256 (cabal/uuid-types-1.0.3/revision/2.cabal) = 2cab161f274309cfd9ef62694a6bd1b47525bc4c79a827293b055e4a9eadb4d2
>-SIZE (cabal/uuid-types-1.0.3/revision/2.cabal) = 2473
>-SHA256 (cabal/vector-0.12.0.3/vector-0.12.0.3.tar.gz) = b8a2bfbf9d22d34a28cde9b9e92bfb054e46797754154dd5883295c38936e5a8
>-SIZE (cabal/vector-0.12.0.3/vector-0.12.0.3.tar.gz) = 124899
>diff --git a/devel/hs-profiteur/pkg-descr b/devel/hs-profiteur/pkg-descr
>deleted file mode 100644
>index 9ea153a8cf60..000000000000
>--- a/devel/hs-profiteur/pkg-descr
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-Profiteur is a visualiser for GHC .prof files.
>-
>-WWW: https://github.com/jaspervdj/profiteur
>diff --git a/devel/hs-profiteur/pkg-plist b/devel/hs-profiteur/pkg-plist
>deleted file mode 100644
>index 6c6ea463b74c..000000000000
>--- a/devel/hs-profiteur/pkg-plist
>+++ /dev/null
>@@ -1,14 +0,0 @@
>-%%DATADIR%%/data/css/main.css
>-%%DATADIR%%/data/html/body.html
>-%%DATADIR%%/data/js/details.js
>-%%DATADIR%%/data/js/main.js
>-%%DATADIR%%/data/js/model.js
>-%%DATADIR%%/data/js/node.js
>-%%DATADIR%%/data/js/resizing-canvas.js
>-%%DATADIR%%/data/js/selection.js
>-%%DATADIR%%/data/js/sorting.js
>-%%DATADIR%%/data/js/tree-browser.js
>-%%DATADIR%%/data/js/tree-map.js
>-%%DATADIR%%/data/js/unicode.js
>-%%DATADIR%%/data/js/zoom.js
>-%%DATADIR%%/jquery-3.3.1.min.js
>diff --git a/devel/ignition-msgs/Makefile b/devel/ignition-msgs/Makefile
>index 95995f697923..f5ce3c59ea8f 100644
>--- a/devel/ignition-msgs/Makefile
>+++ b/devel/ignition-msgs/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	ignition-msgs
> DISTVERSION=	3.0.0
>-PORTREVISION=	4
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
> 
>diff --git a/devel/ignition-transport/Makefile b/devel/ignition-transport/Makefile
>index ddda7b7c525a..6d58c8e5c171 100644
>--- a/devel/ignition-transport/Makefile
>+++ b/devel/ignition-transport/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	ignition-transport
> DISTVERSION=	6.0.0
>-PORTREVISION=	3
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
> 
>diff --git a/devel/libgit2-glib/Makefile b/devel/libgit2-glib/Makefile
>index 3b8f98d6ec58..5434a89653c0 100644
>--- a/devel/libgit2-glib/Makefile
>+++ b/devel/libgit2-glib/Makefile
>@@ -4,7 +4,7 @@
> # Also update devel/libgit2, devel/rubygem-rugged, devel/py-pygit2
> 
> PORTNAME=	libgit2-glib
>-PORTVERSION=	0.28.0.1
>+PORTVERSION=	0.27.8
> CATEGORIES=	devel gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome
>diff --git a/devel/libgit2-glib/distinfo b/devel/libgit2-glib/distinfo
>index 98fbbddf906d..42f003a23f6e 100644
>--- a/devel/libgit2-glib/distinfo
>+++ b/devel/libgit2-glib/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1558699378
>-SHA256 (gnome/libgit2-glib-0.28.0.1.tar.xz) = e70118481241a841d5261bdd4caa3158b2ffcb5ccf9d4f32b6cf6563b83a0f28
>-SIZE (gnome/libgit2-glib-0.28.0.1.tar.xz) = 138928
>+TIMESTAMP = 1550177617
>+SHA256 (gnome/libgit2-glib-0.27.8.tar.xz) = c199d69efd69e27e38a650d78357a135f961501d734967bc8c449064dce31935
>+SIZE (gnome/libgit2-glib-0.27.8.tar.xz) = 137796
>diff --git a/devel/libgit2-glib/pkg-plist b/devel/libgit2-glib/pkg-plist
>index 385dfd6f7014..a5023335565d 100644
>--- a/devel/libgit2-glib/pkg-plist
>+++ b/devel/libgit2-glib/pkg-plist
>@@ -71,7 +71,7 @@ include/libgit2-glib-1.0/libgit2-glib/ggit.h
> lib/girepository-1.0/Ggit-1.0.typelib
> lib/libgit2-glib-1.0.so
> lib/libgit2-glib-1.0.so.0
>-lib/libgit2-glib-1.0.so.0.2800.0
>+lib/libgit2-glib-1.0.so.0.2708.0
> libdata/pkgconfig/libgit2-glib-1.0.pc
> share/gir-1.0/Ggit-1.0.gir
> share/vala/vapi/ggit-1.0.deps
>diff --git a/devel/mill/Makefile b/devel/mill/Makefile
>index d04389c122ec..cda1b174670f 100644
>--- a/devel/mill/Makefile
>+++ b/devel/mill/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mill
>-DISTVERSION=	0.4.2
>+DISTVERSION=	0.4.1
> CATEGORIES=	devel java
> MASTER_SITES=	https://github.com/lihaoyi/mill/releases/download/${PORTVERSION}/
> DISTNAME=	${PORTVERSION}
>diff --git a/devel/mill/distinfo b/devel/mill/distinfo
>index a7a48e866895..d916b17db8c7 100644
>--- a/devel/mill/distinfo
>+++ b/devel/mill/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562334393
>-SHA256 (mill/0.4.2) = 39c080df57338ac0e554ca9942b5e886f71300f53127a56a2a147e6c2620c656
>-SIZE (mill/0.4.2) = 38821355
>+TIMESTAMP = 1560674647
>+SHA256 (mill/0.4.1) = 9da400d31d3aebff1a68a7c1ab89a599955747b6635d42e75db0b4351930359e
>+SIZE (mill/0.4.1) = 38793690
>diff --git a/devel/p5-Config-INI/Makefile b/devel/p5-Config-INI/Makefile
>index 6498b6f57702..ff5df1633ef5 100644
>--- a/devel/p5-Config-INI/Makefile
>+++ b/devel/p5-Config-INI/Makefile
>@@ -18,6 +18,4 @@ RUN_DEPENDS=	p5-Mixin-Linewise>=0.100:devel/p5-Mixin-Linewise
> USES=		perl5
> USE_PERL5=	configure
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/devel/p5-Data-Perl/Makefile b/devel/p5-Data-Perl/Makefile
>index 46a0a3ca07f4..58626aec4853 100644
>--- a/devel/p5-Data-Perl/Makefile
>+++ b/devel/p5-Data-Perl/Makefile
>@@ -23,6 +23,4 @@ RUN_DEPENDS=	p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
> USES=		perl5
> USE_PERL5=	configure
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/devel/p5-Locale-Maketext-Simple/Makefile b/devel/p5-Locale-Maketext-Simple/Makefile
>index 8d41c19568c3..239d65d313bc 100644
>--- a/devel/p5-Locale-Maketext-Simple/Makefile
>+++ b/devel/p5-Locale-Maketext-Simple/Makefile
>@@ -17,6 +17,4 @@ LICENSE_COMB=	dual
> USES=		perl5
> USE_PERL5=	configure
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/devel/p5-Log-Message-Simple/Makefile b/devel/p5-Log-Message-Simple/Makefile
>index fcd5472a3a83..16c17df2b933 100644
>--- a/devel/p5-Log-Message-Simple/Makefile
>+++ b/devel/p5-Log-Message-Simple/Makefile
>@@ -17,6 +17,4 @@ RUN_DEPENDS=	p5-Log-Message>=0:devel/p5-Log-Message
> USES=		perl5
> USE_PERL5=	configure
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/devel/p5-Module-Path/Makefile b/devel/p5-Module-Path/Makefile
>index a1d4c826ea1e..a6a389bdd1b7 100644
>--- a/devel/p5-Module-Path/Makefile
>+++ b/devel/p5-Module-Path/Makefile
>@@ -17,6 +17,4 @@ TEST_DEPENDS=	p5-Devel-FindPerl>0:devel/p5-Devel-FindPerl
> USES=		perl5
> USE_PERL5=	configure
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/devel/p5-MooX-HandlesVia/Makefile b/devel/p5-MooX-HandlesVia/Makefile
>index 77c11bece427..2dd87e80fafc 100644
>--- a/devel/p5-MooX-HandlesVia/Makefile
>+++ b/devel/p5-MooX-HandlesVia/Makefile
>@@ -22,6 +22,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
> USES=		perl5
> USE_PERL5=	configure
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
>index 996a98bfd233..488fd03be5d1 100644
>--- a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
>+++ b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
>@@ -22,6 +22,4 @@ TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
> USES=		perl5
> USE_PERL5=	configure
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/devel/p5-MooseX-LazyRequire/Makefile b/devel/p5-MooseX-LazyRequire/Makefile
>index f31a4d32fdd7..e01c47583cf8 100644
>--- a/devel/p5-MooseX-LazyRequire/Makefile
>+++ b/devel/p5-MooseX-LazyRequire/Makefile
>@@ -21,6 +21,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
> USES=		perl5
> USE_PERL5=	modbuildtiny
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/devel/p5-MooseX-SetOnce/Makefile b/devel/p5-MooseX-SetOnce/Makefile
>index a89ad6feb3cb..22c9234cc0f4 100644
>--- a/devel/p5-MooseX-SetOnce/Makefile
>+++ b/devel/p5-MooseX-SetOnce/Makefile
>@@ -21,6 +21,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
> USES=		perl5
> USE_PERL5=	configure
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/devel/p5-MooseX-Types-Perl/Makefile b/devel/p5-MooseX-Types-Perl/Makefile
>index e996404c5b80..1281d3c301ae 100644
>--- a/devel/p5-MooseX-Types-Perl/Makefile
>+++ b/devel/p5-MooseX-Types-Perl/Makefile
>@@ -18,9 +18,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
> RUN_DEPENDS=	p5-MooseX-Types>=0:devel/p5-MooseX-Types \
> 		p5-Params-Util>=0:devel/p5-Params-Util
> 
>-USES=		perl5
> USE_PERL5=	configure
>-
>-NO_ARCH=	yes
>+USES=		perl5
> 
> .include <bsd.port.mk>
>diff --git a/devel/p5-Params-Check/Makefile b/devel/p5-Params-Check/Makefile
>index 068e28f24915..158a937a6867 100644
>--- a/devel/p5-Params-Check/Makefile
>+++ b/devel/p5-Params-Check/Makefile
>@@ -17,8 +17,6 @@ LICENSE_COMB=	dual
> USES=		perl5
> USE_PERL5=	configure
> 
>-NO_ARCH=	yes
>-
> PORTDOCS=	CHANGES
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/devel/p5-Syntax-Keyword-Junction/Makefile b/devel/p5-Syntax-Keyword-Junction/Makefile
>index c54e2e4f24b9..8fb4ecd58a5e 100644
>--- a/devel/p5-Syntax-Keyword-Junction/Makefile
>+++ b/devel/p5-Syntax-Keyword-Junction/Makefile
>@@ -19,6 +19,4 @@ RUN_DEPENDS=	p5-syntax>=0:devel/p5-syntax \
> USES=		perl5
> USE_PERL5=	configure
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/devel/p5-Term-TablePrint/Makefile b/devel/p5-Term-TablePrint/Makefile
>index eb4dce317486..190145e9b1c4 100644
>--- a/devel/p5-Term-TablePrint/Makefile
>+++ b/devel/p5-Term-TablePrint/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	Term-TablePrint
>-PORTVERSION=	0.115
>+PORTVERSION=	0.114
> CATEGORIES=	devel perl5
> MASTER_SITES=	CPAN
> PKGNAMEPREFIX=	p5-
>diff --git a/devel/p5-Term-TablePrint/distinfo b/devel/p5-Term-TablePrint/distinfo
>index 1eadd84df90f..88a247cfc830 100644
>--- a/devel/p5-Term-TablePrint/distinfo
>+++ b/devel/p5-Term-TablePrint/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562347451
>-SHA256 (Term-TablePrint-0.115.tar.gz) = 5edbf7bbd101cdf6d982f89fbf48aa93927f072ba6d75d7b6b655e5314cc8f49
>-SIZE (Term-TablePrint-0.115.tar.gz) = 22889
>+TIMESTAMP = 1562260801
>+SHA256 (Term-TablePrint-0.114.tar.gz) = cb5cb332ceb7c81b26f2344932f444d73b3b786f022d46bc0430c32b4b15e06c
>+SIZE (Term-TablePrint-0.114.tar.gz) = 22892
>diff --git a/devel/p5-UNIVERSAL-can/Makefile b/devel/p5-UNIVERSAL-can/Makefile
>index 77ca907ae3c5..bb047ddb6ff9 100644
>--- a/devel/p5-UNIVERSAL-can/Makefile
>+++ b/devel/p5-UNIVERSAL-can/Makefile
>@@ -17,6 +17,4 @@ LICENSE_COMB=	dual
> USES=		perl5
> USE_PERL5=	configure
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/devel/p5-syntax/Makefile b/devel/p5-syntax/Makefile
>index 3dacd044d4c6..3e7e84fda36e 100644
>--- a/devel/p5-syntax/Makefile
>+++ b/devel/p5-syntax/Makefile
>@@ -19,9 +19,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
> RUN_DEPENDS=	p5-Data-OptList>=0.104:devel/p5-Data-OptList \
> 		p5-namespace-clean>=0:devel/p5-namespace-clean
> 
>-USES=		perl5
> USE_PERL5=	configure
>-
>-NO_ARCH=	yes
>+USES=		perl5
> 
> .include <bsd.port.mk>
>diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile
>index 45313d92f7fb..b481739a56cc 100644
>--- a/devel/protobuf-c/Makefile
>+++ b/devel/protobuf-c/Makefile
>@@ -4,7 +4,6 @@
> PORTNAME=		protobuf-c
> PORTVERSION=		1.3.2
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
> CATEGORIES=		devel
> 
> MAINTAINER=	truckman@FreeBSD.org
>diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
>index b12496875174..b7c29789aba8 100644
>--- a/devel/protobuf/Makefile
>+++ b/devel/protobuf/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	protobuf
>-PORTVERSION=	3.8.0
>+PORTVERSION=	3.7.1
> PORTEPOCH=	1
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/protocolbuffers/protobuf/releases/download/v${PORTVERSION}/
>diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo
>index ab86b49ebad4..9b73a8d5c2ba 100644
>--- a/devel/protobuf/distinfo
>+++ b/devel/protobuf/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1559219506
>-SHA256 (protobuf-all-3.8.0.tar.gz) = b7220b41481011305bf9100847cf294393973e869973a9661046601959b2960b
>-SIZE (protobuf-all-3.8.0.tar.gz) = 7151747
>+TIMESTAMP = 1558270022
>+SHA256 (protobuf-all-3.7.1.tar.gz) = c10ef8d8ad5a9e5f850483051b7f9ee2c8bb3ca2e0e16a4cf105bd1321afb2d6
>+SIZE (protobuf-all-3.7.1.tar.gz) = 7018070
>diff --git a/devel/protobuf/pkg-plist b/devel/protobuf/pkg-plist
>index aee55c07cc52..0fb325f025e5 100644
>--- a/devel/protobuf/pkg-plist
>+++ b/devel/protobuf/pkg-plist
>@@ -111,19 +111,20 @@ include/google/protobuf/util/type_resolver.h
> include/google/protobuf/util/type_resolver_util.h
> include/google/protobuf/wire_format.h
> include/google/protobuf/wire_format_lite.h
>+include/google/protobuf/wire_format_lite_inl.h
> include/google/protobuf/wrappers.pb.h
> include/google/protobuf/wrappers.proto
> lib/libprotobuf-lite.a
> lib/libprotobuf-lite.so
>-lib/libprotobuf-lite.so.19
>-lib/libprotobuf-lite.so.19.0.0
>+lib/libprotobuf-lite.so.18
>+lib/libprotobuf-lite.so.18.0.1
> lib/libprotobuf.a
> lib/libprotobuf.so
>-lib/libprotobuf.so.19
>-lib/libprotobuf.so.19.0.0
>+lib/libprotobuf.so.18
>+lib/libprotobuf.so.18.0.1
> lib/libprotoc.a
> lib/libprotoc.so
>-lib/libprotoc.so.19
>-lib/libprotoc.so.19.0.0
>+lib/libprotoc.so.18
>+lib/libprotoc.so.18.0.1
> libdata/pkgconfig/protobuf-lite.pc
> libdata/pkgconfig/protobuf.pc
>diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile
>index 797e2d6b1fb2..8bcd0d0ab559 100644
>--- a/devel/py-hypothesis/Makefile
>+++ b/devel/py-hypothesis/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	hypothesis
>-PORTVERSION=	4.26.1
>+PORTVERSION=	4.26.0
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git a/devel/py-hypothesis/distinfo b/devel/py-hypothesis/distinfo
>index 0b899b750e1b..a1cd291b8e06 100644
>--- a/devel/py-hypothesis/distinfo
>+++ b/devel/py-hypothesis/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562347455
>-SHA256 (hypothesis-4.26.1.tar.gz) = d1e3e32a25feb8f52fcd460a04f48c70820175a2ae2b296111fa4b6bb7983a37
>-SIZE (hypothesis-4.26.1.tar.gz) = 202811
>+TIMESTAMP = 1562260803
>+SHA256 (hypothesis-4.26.0.tar.gz) = 73fd7578b2c8df3884dda08e61e7c27f6fdf4bc837aeb54ce568ecca13289cba
>+SIZE (hypothesis-4.26.0.tar.gz) = 201954
>diff --git a/devel/py-oslo.config/Makefile b/devel/py-oslo.config/Makefile
>index 67af931a5e5d..3541562776d1 100644
>--- a/devel/py-oslo.config/Makefile
>+++ b/devel/py-oslo.config/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	oslo.config
>-PORTVERSION=	6.11.0
>+PORTVERSION=	6.10.0
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git a/devel/py-oslo.config/distinfo b/devel/py-oslo.config/distinfo
>index 6ae0baa83d57..bf5a615bd7af 100644
>--- a/devel/py-oslo.config/distinfo
>+++ b/devel/py-oslo.config/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562347461
>-SHA256 (oslo.config-6.11.0.tar.gz) = b69ce88338a039655e8c7463bfbf102995cca31876c197381f1a1a20a039f1f6
>-SIZE (oslo.config-6.11.0.tar.gz) = 152732
>+TIMESTAMP = 1560537270
>+SHA256 (oslo.config-6.10.0.tar.gz) = 98427e4a4c1d0530ed2954c3efe610fa8de377f4dfeabe7eb951d02508797408
>+SIZE (oslo.config-6.10.0.tar.gz) = 152458
>diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile
>index 3b05371a9564..289f2a63eb24 100644
>--- a/devel/py-protobuf/Makefile
>+++ b/devel/py-protobuf/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	protobuf
>-PORTVERSION=	3.8.0
>+PORTVERSION=	3.7.1
> PORTEPOCH=	1
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
>diff --git a/devel/py-protobuf/distinfo b/devel/py-protobuf/distinfo
>index 89f5826116d3..215d01c98b6c 100644
>--- a/devel/py-protobuf/distinfo
>+++ b/devel/py-protobuf/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1559219514
>-SHA256 (protobuf-3.8.0.tar.gz) = 8c61cc8a76e9d381c665aecc5105fa0f1878cf7db8b5cd17202603bcb386d0fc
>-SIZE (protobuf-3.8.0.tar.gz) = 258676
>+TIMESTAMP = 1553693687
>+SHA256 (protobuf-3.7.1.tar.gz) = 21e395d7959551e759d604940a115c51c6347d90a475c9baf471a1a86b5604a9
>+SIZE (protobuf-3.7.1.tar.gz) = 255369
>diff --git a/devel/py-pyface/Makefile b/devel/py-pyface/Makefile
>index 6fd999d98e0b..2637e87bfe45 100644
>--- a/devel/py-pyface/Makefile
>+++ b/devel/py-pyface/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	pyface
>-PORTVERSION=	6.1.1
>+PORTVERSION=	6.1.0
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git a/devel/py-pyface/distinfo b/devel/py-pyface/distinfo
>index 0e2921d18ca3..82f24490da53 100644
>--- a/devel/py-pyface/distinfo
>+++ b/devel/py-pyface/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562193892
>-SHA256 (pyface-6.1.1.tar.gz) = a7e6d58e441b70748baa96ed3c921835b10a14a1c5857109b9de37062b8cb9e0
>-SIZE (pyface-6.1.1.tar.gz) = 5326427
>+TIMESTAMP = 1557583950
>+SHA256 (pyface-6.1.0.tar.gz) = bcdf3628bbfa1fdd218d7b488326473f3b08cdaf9cadcd3fb430f2ecd75ebec3
>+SIZE (pyface-6.1.0.tar.gz) = 5306751
>diff --git a/devel/rubygem-tins/Makefile b/devel/rubygem-tins/Makefile
>index 79b5e6826008..f9c53f1fdf15 100644
>--- a/devel/rubygem-tins/Makefile
>+++ b/devel/rubygem-tins/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	tins
>-PORTVERSION=	1.21.0
>+PORTVERSION=	1.20.3
> CATEGORIES=	devel rubygems
> MASTER_SITES=	RG
> 
>diff --git a/devel/rubygem-tins/distinfo b/devel/rubygem-tins/distinfo
>index 71a9b7c9656c..ab7eb7d49b36 100644
>--- a/devel/rubygem-tins/distinfo
>+++ b/devel/rubygem-tins/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562347472
>-SHA256 (rubygem/tins-1.21.0.gem) = 7d693268ba8fe2966737dce686b6a9adf25e693b00009e2894b796360fc5ce50
>-SIZE (rubygem/tins-1.21.0.gem) = 305664
>+TIMESTAMP = 1559381119
>+SHA256 (rubygem/tins-1.20.3.gem) = 265914a32b805a7782a9d62eb3392b0b569eeefed7c69733e6b9d17e429e530e
>+SIZE (rubygem/tins-1.20.3.gem) = 305664
>diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile
>index 802cbce9123b..0f4cd21bf1f9 100644
>--- a/dns/dnsdist/Makefile
>+++ b/dns/dnsdist/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	dnsdist
> DISTVERSION=	1.3.3
>-PORTREVISION=	8
>+PORTREVISION=	7
> CATEGORIES=	dns net
> MASTER_SITES=	https://downloads.powerdns.com/releases/ \
> 		LOCAL/cpm
>diff --git a/dns/dnstable/Makefile b/dns/dnstable/Makefile
>index 75c0998b5f39..01b1cf9ef2cc 100644
>--- a/dns/dnstable/Makefile
>+++ b/dns/dnstable/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	dnstable
>-PORTVERSION=	0.11.2
>+PORTVERSION=	0.11.0
> CATEGORIES=	dns
> MASTER_SITES=	FARSIGHT LOCAL/truckman/farsight
> 
>diff --git a/dns/dnstable/distinfo b/dns/dnstable/distinfo
>index 1099f277b163..9ca75e2f224f 100644
>--- a/dns/dnstable/distinfo
>+++ b/dns/dnstable/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562347197
>-SHA256 (dnstable-0.11.2.tar.gz) = ea6bbae9bcc63b872381a40005bda6a4daa789395e3ed56216bf1ba421cd2ab2
>-SIZE (dnstable-0.11.2.tar.gz) = 472984
>+TIMESTAMP = 1559945201
>+SHA256 (dnstable-0.11.0.tar.gz) = ccbe3f313d7cac7b156e61e24eebcdc4b817a089f986dd3f58dc75524a18de7e
>+SIZE (dnstable-0.11.0.tar.gz) = 413321
>diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
>index 9fcd1155f123..dacb89754c2d 100644
>--- a/dns/knot-resolver/Makefile
>+++ b/dns/knot-resolver/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	knot-resolver
> DISTVERSION=	3.2.1
>-PORTREVISION=	3
>+PORTREVISION=	2
> CATEGORIES=	dns ipv6
> MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
> 		https://dns.company/downloads/knot-resolver/
>diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
>index b80d68b8cb2a..ff99d46a8e9d 100644
>--- a/dns/powerdns-recursor/Makefile
>+++ b/dns/powerdns-recursor/Makefile
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	recursor
> DISTVERSION=	4.1.14
>-PORTREVISION=	1
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://downloads.powerdns.com/releases/
> PKGNAMEPREFIX=	powerdns-
>diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
>index 38d122378246..122fd1e06e0f 100644
>--- a/dns/powerdns/Makefile
>+++ b/dns/powerdns/Makefile
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	powerdns
> DISTVERSION=	4.1.10
>-PORTREVISION=	1
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://downloads.powerdns.com/releases/
> DISTNAME=	pdns-${DISTVERSION}
>diff --git a/dns/py-pydnstable/Makefile b/dns/py-pydnstable/Makefile
>index 38c243d4668d..1d1d4dc28682 100644
>--- a/dns/py-pydnstable/Makefile
>+++ b/dns/py-pydnstable/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	pydnstable
>-PORTVERSION=	0.7.2
>+PORTVERSION=	0.7.0
> CATEGORIES=	dns python
> MASTER_SITES=	FARSIGHT LOCAL/truckman/farsight
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git a/dns/py-pydnstable/distinfo b/dns/py-pydnstable/distinfo
>index 53e9e4e9dcdc..a5324e0b13e3 100644
>--- a/dns/py-pydnstable/distinfo
>+++ b/dns/py-pydnstable/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562352444
>-SHA256 (pydnstable-0.7.2.tar.gz) = 3394a88c2cd297eaab3473e1c98a6af67d1f4b86256f5c623c58ee1c4728e540
>-SIZE (pydnstable-0.7.2.tar.gz) = 8620
>+TIMESTAMP = 1559945702
>+SHA256 (pydnstable-0.7.0.tar.gz) = c302b1cffd8a6d2be27e6366f6578bfab04203ed6463884cacd4127e6aafd3f8
>+SIZE (pydnstable-0.7.0.tar.gz) = 8595
>diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
>index 76cc61a1fe60..da4f60e83292 100644
>--- a/emulators/yuzu/Makefile
>+++ b/emulators/yuzu/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	yuzu
>-PORTVERSION=	s20190705
>+PORTVERSION=	s20190702
> PORTREVISION?=	0
> CATEGORIES=	emulators
> 
>@@ -28,7 +28,7 @@ BUILD_DEPENDS=	boost-libs>=1.66:devel/boost-libs \
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	yuzu-emu
>-GH_TAGNAME=	772c86a26
>+GH_TAGNAME=	58032e008
> GH_TUPLE=	yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \
> 		DarkLordZach:mbedtls:a280e60:mbedtls/externals/mbedtls \
> 		KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \
>@@ -92,10 +92,8 @@ post-patch:
> 		-e 's/@GIT_DESC@/${GH_TAGNAME}/' \
> 		${WRKSRC}/src/common/scm_rev.cpp.in
> 
>-.if !defined(MASTERNAME) || ${MASTERNAME} != 120amd64-default # XXX hangs on beefy6
> .ifndef QEMU_EMULATING
> pre-install:	do-test
> .endif
>-.endif
> 
> .include <bsd.port.mk>
>diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo
>index 3c3b2c8310d8..a97200f4cc51 100644
>--- a/emulators/yuzu/distinfo
>+++ b/emulators/yuzu/distinfo
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1562348353
>-SHA256 (yuzu-emu-yuzu-s20190705-772c86a26_GH0.tar.gz) = cae3329193d4dd3075720c434985691fe0f2e712551d7b9c09ef00e7a78322b8
>-SIZE (yuzu-emu-yuzu-s20190705-772c86a26_GH0.tar.gz) = 2682048
>+TIMESTAMP = 1562124777
>+SHA256 (yuzu-emu-yuzu-s20190702-58032e008_GH0.tar.gz) = 62e262def1679a62d4e5a1ab5b57bc42fc27c58098005ee8ff211e7ab78bdf60
>+SIZE (yuzu-emu-yuzu-s20190702-58032e008_GH0.tar.gz) = 2672721
> SHA256 (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 8f7b4d8eb998c2a4c146268d83b44fc22ca8d4d276f26d6af1071e51f4b5bd4f
> SIZE (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 3296254
> SHA256 (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 4fc6ddc256bc75b975fd5ad8bb7d31ff79c62d49daafb0108585c9ef80c6c5a7
>diff --git a/ftp/R-cran-RCurl/Makefile b/ftp/R-cran-RCurl/Makefile
>index 7468eb0dab0c..0dbee6a0d8d3 100644
>--- a/ftp/R-cran-RCurl/Makefile
>+++ b/ftp/R-cran-RCurl/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	RCurl
>-DISTVERSION=	1.95-4.12
>+DISTVERSION=	1.95-4.11
>+PORTREVISION=	1
> CATEGORIES=	ftp
> DISTNAME=	${PORTNAME}_${DISTVERSION}
> 
>@@ -17,7 +18,6 @@ BUILD_DEPENDS=	curl-config:ftp/curl \
> RUN_DEPENDS=	${CRAN_DEPENDS}
> LIB_DEPENDS=	libcurl.so:ftp/curl
> 
>-USES=		cran:auto-plist,compiles gnome
>-USE_GNOME=	libxml2
>+USES=		cran:auto-plist,compiles
> 
> .include <bsd.port.mk>
>diff --git a/ftp/R-cran-RCurl/distinfo b/ftp/R-cran-RCurl/distinfo
>index 55967aa85a19..0468296917ed 100644
>--- a/ftp/R-cran-RCurl/distinfo
>+++ b/ftp/R-cran-RCurl/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562409764
>-SHA256 (RCurl_1.95-4.12.tar.gz) = 393779efafdf40823dac942a1e028905d65c34f3d41cfd21bcd225e411385ff4
>-SIZE (RCurl_1.95-4.12.tar.gz) = 916763
>+TIMESTAMP = 1532053058
>+SHA256 (RCurl_1.95-4.11.tar.gz) = 792a091cf5b80c460d98ed80fe1cad5d9406d0afc32e466e970ee4d2f68c97bf
>+SIZE (RCurl_1.95-4.11.tar.gz) = 916667
>diff --git a/games/cockatrice/Makefile b/games/cockatrice/Makefile
>index af22ce3d9ae4..8c3491771fe5 100644
>--- a/games/cockatrice/Makefile
>+++ b/games/cockatrice/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	Cockatrice
> PORTVERSION=	2.7.0
>-PORTREVISION=	2
>+PORTREVISION=	1
> CATEGORIES=	games
> 
> MAINTAINER=	sbruno@FreeBSD.org
>diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
>index 889a01157bee..9c9fe0e0bccb 100644
>--- a/games/pink-pony/Makefile
>+++ b/games/pink-pony/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	pink-pony
> PORTVERSION=	1.4.1
>-PORTREVISION=	15
>+PORTREVISION=	14
> CATEGORIES=	games
> 
> MAINTAINER=	amdmi3@FreeBSD.org
>diff --git a/graphics/caffe/Makefile b/graphics/caffe/Makefile
>index cffb8a9c72bc..c4c3f5885915 100644
>--- a/graphics/caffe/Makefile
>+++ b/graphics/caffe/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	caffe
> PORTVERSION=	1.0
>-PORTREVISION=	23
>+PORTREVISION=	22
> CATEGORIES=	graphics
> 
> MAINTAINER=	eric@camachat.org
>diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
>index 17ac417b26bd..af254dcb565d 100644
>--- a/graphics/opencv/Makefile
>+++ b/graphics/opencv/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	opencv
> PORTVERSION=	3.4.1
>-PORTREVISION=	19
>+PORTREVISION=	18
> CATEGORIES=	graphics
> 
> MAINTAINER=	ports@FreeBSD.org
>diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
>index 47402f4f1193..a703d8603d2b 100644
>--- a/graphics/osgearth/Makefile
>+++ b/graphics/osgearth/Makefile
>@@ -4,7 +4,6 @@
> PORTNAME=	osgearth
> PORTVERSION=	2.10.1
> DISTVERSIONPREFIX=	${PORTNAME}-
>-PORTREVISION=	1
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	lbartoletti@tuxfamily.org
>diff --git a/graphics/qtpbfimageplugin/Makefile b/graphics/qtpbfimageplugin/Makefile
>index fa2c486dc56b..14f2782d3f6e 100644
>--- a/graphics/qtpbfimageplugin/Makefile
>+++ b/graphics/qtpbfimageplugin/Makefile
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	qtpbfimageplugin
> PORTVERSION=	1.4
>-PORTREVISION=	1
> CATEGORIES=	graphics
> 
> MAINTAINER=	sikmir@gmail.com
>diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
>index f5152689544a..3dc1912fabd4 100644
>--- a/graphics/xsane/Makefile
>+++ b/graphics/xsane/Makefile
>@@ -5,6 +5,7 @@ PORTNAME=	xsane
> PORTVERSION=	0.999
> PORTREVISION=	6
> CATEGORIES=	graphics
>+MASTER_SITES=	http://www.xsane.org/download/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Gtk-based X11 frontend for SANE (Scanner Access Now Easy)
>@@ -19,14 +20,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
> BUILD_DEPENDS=	scanimage:graphics/sane-backends
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>-USES=		gmake gnome jpeg localbase:ldflags pkgconfig
>-USE_GITLAB=	yes
>-# This is a workaround to convert the subproject into a project. It's also
>-# required to avoid slashes in the DISTNAME.
>-GL_SITE=	https://gitlab.com/sane-project
>-GL_ACCOUNT=	frontend # would be 'sane-project'
>-# ...and GL_PROJECT would be 'frontend/xsane' then but introduces a '/' to DISTNAME
>-GL_COMMIT=	d01b4089ce6778e76fa86a0410d4e80cf6eb819e
>+USES=		gmake jpeg localbase:ldflags pkgconfig
> USE_GNOME=	gtk20 gdkpixbuf2
> GNU_CONFIGURE=	yes
> 
>diff --git a/graphics/xsane/distinfo b/graphics/xsane/distinfo
>index 59e8297f29cb..47e0deec2f34 100644
>--- a/graphics/xsane/distinfo
>+++ b/graphics/xsane/distinfo
>@@ -1,3 +1,2 @@
>-TIMESTAMP = 1562249203
>-SHA256 (frontend-xsane-d01b4089ce6778e76fa86a0410d4e80cf6eb819e_GL0.tar.gz) = 1229948de893238a8f338978fcbce10184fa8723dee430ebc52cac29d5a4ae1b
>-SIZE (frontend-xsane-d01b4089ce6778e76fa86a0410d4e80cf6eb819e_GL0.tar.gz) = 2427728
>+SHA256 (xsane-0.999.tar.gz) = 5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b
>+SIZE (xsane-0.999.tar.gz) = 2950621
>diff --git a/graphics/xsane/pkg-descr b/graphics/xsane/pkg-descr
>index a09b5cf2271c..85d15e8abefa 100644
>--- a/graphics/xsane/pkg-descr
>+++ b/graphics/xsane/pkg-descr
>@@ -1,4 +1,4 @@
> XSANE is a gtk based X11 frontend for SANE (Scanner Access Now Easy).
> It works either standalone or as a GIMP plugin.
> 
>-WWW: https://gitlab.com/sane-project/frontend/xsane
>+WWW: http://www.xsane.org/
>diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
>index f439efc9673d..ae4725643908 100644
>--- a/irc/inspircd/Makefile
>+++ b/irc/inspircd/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	inspircd
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	3.2.0
>+DISTVERSION=	3.1.0
> CATEGORIES=	irc
> 
> MAINTAINER=	dg@syrec.org
>@@ -28,8 +28,7 @@ CONFIGURE_ARGS=	--binary-dir=${PREFIX}/bin \
> 		--manual-dir=${MANPREFIX}/man/man1 \
> 		--module-dir=${PREFIX}/libexec/${PORTNAME}/modules \
> 		--prefix=${PREFIX}/libexec/${PORTNAME} \
>-		--distribution-label=${OPSYS}-${PORTVERSION} \
>-		--disable-auto-extras
>+		--distribution-label=${OPSYS}-${PORTVERSION}
> 
> USE_RC_SUBR=	${PORTNAME}
> MAKEFILE=	GNUmakefile
>@@ -43,7 +42,7 @@ INSPIRCD_DBDIR?=	/var/db/${PORTNAME}
> INSPIRCD_LOGDIR?=	/var/log/${PORTNAME}
> INSPIRCD_RUNDIR?=	/var/run/${PORTNAME}
> 
>-SUB_FILES=	pkg-message
>+SUB_FILES=	pkg-deinstall
> SUB_LIST=	INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \
> 		INSPIRCD_GROUP=${GROUPS} \
> 		INSPIRCD_LOGDIR=${INSPIRCD_LOGDIR} \
>diff --git a/irc/inspircd/distinfo b/irc/inspircd/distinfo
>index 920c9562386e..fd43921492c2 100644
>--- a/irc/inspircd/distinfo
>+++ b/irc/inspircd/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562413014
>-SHA256 (inspircd-inspircd-v3.2.0_GH0.tar.gz) = 16d0b92a5610236e6cd2ece2a6a84eda1a16e4217f0e673ab089a25cf4001ef4
>-SIZE (inspircd-inspircd-v3.2.0_GH0.tar.gz) = 799842
>+TIMESTAMP = 1558182673
>+SHA256 (inspircd-inspircd-v3.1.0_GH0.tar.gz) = 5fd6b30e0285dd2bcf6fd135ffce52a08d8452f820a02e0068ac471e99d465ba
>+SIZE (inspircd-inspircd-v3.1.0_GH0.tar.gz) = 795435
>diff --git a/irc/inspircd/files/patch-configure b/irc/inspircd/files/patch-configure
>index 6dbe6e3e5fc1..3615046f139b 100644
>--- a/irc/inspircd/files/patch-configure
>+++ b/irc/inspircd/files/patch-configure
>@@ -1,7 +1,7 @@
>---- configure.orig	2019-07-05 09:09:06 UTC
>+--- configure.orig	2019-05-10 20:05:04 UTC
> +++ configure
>-@@ -207,57 +207,10 @@ if (defined $opt_system) {
>- 	$config{SCRIPT_DIR}  = $opt_script_dir  // $config{SCRIPT_DIR}  // $config{BASE_DIR};
>+@@ -199,57 +199,10 @@ if (defined $opt_system) {
>+ 	$config{SCRIPT_DIR} = $opt_script_dir // $config{SCRIPT_DIR} // $config{BASE_DIR};
>  }
>  
> -# Parse --gid=123 or --gid=foo and extract the group id.
>diff --git a/irc/inspircd/files/patch-make_template_main.mk b/irc/inspircd/files/patch-make_template_main.mk
>index 674ad933e52c..d2b788fecb50 100644
>--- a/irc/inspircd/files/patch-make_template_main.mk
>+++ b/irc/inspircd/files/patch-make_template_main.mk
>@@ -1,16 +1,15 @@
>---- make/template/main.mk.orig	2019-07-06 12:03:50 UTC
>+--- make/template/main.mk.orig	2019-05-10 08:54:28 UTC
> +++ make/template/main.mk
>-@@ -206,33 +206,33 @@ finishmessage: target
>+@@ -203,32 +203,32 @@ finishmessage: target
>  	@echo "*************************************"
>  
>  install: target
> -	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BASE)
>--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
>--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
> -	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
>--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
>--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
> -	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
>+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
>+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/services
>+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
> -	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
> -	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
> -	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(SCRPATH)
>@@ -19,12 +18,11 @@
> -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null
> -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null
> +	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BASE)
>-+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
>-+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)
> +	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(DATPATH)
>-+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(EXAPATH)/services
>-+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(EXAPATH)/sql
> +	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(LOGPATH)
>++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
>++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/services
>++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
> +	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH)
> +	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
> +	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(SCRPATH)
>@@ -41,16 +39,16 @@
> -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
> -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
> -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
>--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
>--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
>--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
>+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
>+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
>+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
> -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
> +	-$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
> +	-$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
> +	-$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
>-+	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
>-+	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
>-+	-$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
>++	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
>++	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
>++	-$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
> +	-$(INSTALL) -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
>  	@echo ""
>  	@echo "*************************************"
>diff --git a/irc/inspircd/files/pkg-deinstall.in b/irc/inspircd/files/pkg-deinstall.in
>new file mode 100644
>index 000000000000..8646e9ca08a4
>--- /dev/null
>+++ b/irc/inspircd/files/pkg-deinstall.in
>@@ -0,0 +1,22 @@
>+#!/bin/sh
>+# $FreeBSD$
>+
>+case $2 in
>+POST-DEINSTALL)
>+    cat <<EOMSG
>+
>+To completely remove %%PORTNAME%%, you may wish to
>+remove its configuration, database and log directories:
>+
>+    # rm -rf %%ETCDIR%% \\
>+        %%INSPIRCD_DBDIR%% \\
>+        %%INSPIRCD_LOGDIR%% \\
>+        %%INSPIRCD_RUNDIR%%
>+
>+To remove the %%INSPIRCD_USER%% user and the %%INSPIRCD_GROUP%% group, run:
>+
>+    # pw groupdel %%INSPIRCD_GROUP%%
>+    # pw userdel %%INSPIRCD_USER%%
>+
>+EOMSG
>+esac
>diff --git a/irc/inspircd/files/pkg-message.in b/irc/inspircd/files/pkg-message.in
>deleted file mode 100644
>index 27224df24b7d..000000000000
>--- a/irc/inspircd/files/pkg-message.in
>+++ /dev/null
>@@ -1,29 +0,0 @@
>-[
>-{
>-  type: upgrade,
>-  maximum_version: 3,
>-  message: <<EOM
>-InspIRCd v3 has many configuration changes that are not backwards
>-compatible with InspIRCd v2. Please review
>-https://docs.inspircd.org/3/configuration-changes/ and update your
>-configuration files accrdingly.
>-EOM
>-}
>-{
>-  type: remove,
>-  message: <<EOM
>-To completely remove %%PORTNAME%%, you may wish to remove its
>-configuration, database and log directories:
>-
>-    # rm -rf %%ETCDIR%% \\
>-        %%INSPIRCD_DBDIR%% \\
>-        %%INSPIRCD_LOGDIR%% \\
>-        %%INSPIRCD_RUNDIR%%
>-
>-To remove the %%INSPIRCD_USER%% user and the %%INSPIRCD_GROUP%% group, run:
>-
>-    # pw groupdel %%INSPIRCD_GROUP%%
>-    # pw userdel %%INSPIRCD_USER%%
>-EOM
>-}
>-]
>diff --git a/irc/inspircd/pkg-message b/irc/inspircd/pkg-message
>new file mode 100644
>index 000000000000..4d1504bfb700
>--- /dev/null
>+++ b/irc/inspircd/pkg-message
>@@ -0,0 +1,6 @@
>+========================================================================
>+InspIRCd v3 has many configuration changes that are not backwards
>+compatible with InspIRCd v2. If you are upgrading from v2, please review
>+https://docs.inspircd.org/3/configuration-changes/ and update your
>+configuration files accrdingly.
>+========================================================================
>diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
>index c6d9b583aa39..f3a9e3267024 100644
>--- a/irc/inspircd/pkg-plist
>+++ b/irc/inspircd/pkg-plist
>@@ -190,6 +190,7 @@ libexec/inspircd/modules/m_sqlauth.so
> libexec/inspircd/modules/m_sqloper.so
> libexec/inspircd/modules/m_sslinfo.so
> libexec/inspircd/modules/m_sslmodes.so
>+libexec/inspircd/modules/m_sslrehashsignal.so
> libexec/inspircd/modules/m_starttls.so
> libexec/inspircd/modules/m_stripcolor.so
> libexec/inspircd/modules/m_svshold.so
>diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
>index 1b20403e7f7c..9a2619643213 100644
>--- a/japanese/mozc-server/Makefile
>+++ b/japanese/mozc-server/Makefile
>@@ -4,7 +4,7 @@
> PORTNAME=	mozc
> PORTVERSION=	2.23.2815.102.00
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	2
>+PORTREVISION=	1
> CATEGORIES=	japanese
> 
> MAINTAINER=	hrs@FreeBSD.org
>diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
>index ac76c119c9b8..66bf9205bf41 100644
>--- a/lang/rust-nightly/Makefile
>+++ b/lang/rust-nightly/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Jean-SÃ©bastien PÃ©dron <dumbbell@FreeBSD.org>
> # $FreeBSD$
> 
>-PORTVERSION=	1.38.0.${NIGHTLY_DATE:C,-,,g}
>+PORTVERSION=	1.37.0.${NIGHTLY_DATE:C,-,,g}
> PKGNAMESUFFIX=	-nightly
> DISTNAME=	rustc-nightly-src
> 
>@@ -14,11 +14,11 @@ CONFLICTS_INSTALL=	rust
> # Which source to pull:
> #   https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz
> #   https://static.rust-lang.org/dist/channel-rust-nightly.toml
>-NIGHTLY_DATE=			2019-07-06
>+NIGHTLY_DATE=			2019-07-04
> NIGHTLY_SUBDIR=			${NIGHTLY_DATE}/
> 
> # See WRKSRC/src/stage0.txt for this date
>-BOOTSTRAPS_DATE=		2019-07-04
>+BOOTSTRAPS_DATE=		2019-05-23
> RUST_BOOTSTRAP_VERSION=		beta
> CARGO_BOOTSTRAP_VERSION=	beta
> 
>diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
>index 0f690cc61fd8..2b5ac3be572c 100644
>--- a/lang/rust-nightly/distinfo
>+++ b/lang/rust-nightly/distinfo
>@@ -1,15 +1,15 @@
>-TIMESTAMP = 1562358241
>-SHA256 (rust/2019-07-06/rustc-nightly-src.tar.xz) = 695343f5d849b831055ca0bd7574518d79dd4207523f1f6ffecdfcd31b1f5bca
>-SIZE (rust/2019-07-06/rustc-nightly-src.tar.xz) = 100132964
>-SHA256 (rust/2019-07-04/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 2e3f9fd2ba916facd3239df2bab16420161c6aa62d03317caa3b038ce56e5738
>-SIZE (rust/2019-07-04/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 70343111
>-SHA256 (rust/2019-07-04/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 735c8a380bd369ca4b1c05cb3f93d3fad41e073a94146230f4e851be66f23b0f
>-SIZE (rust/2019-07-04/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 88003301
>-SHA256 (rust/2019-07-04/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 80c88e5daba6a6cd0d0d31984c38fdc63abc8d73343d292465d5a02e8eff5d13
>-SIZE (rust/2019-07-04/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 6718440
>-SHA256 (rust/2019-07-04/rustc-beta-i686-unknown-freebsd.tar.gz) = f2fad1e6a482ac71d4ecac22d951c3de5000d175bc18b63f4767824bd9b6947f
>-SIZE (rust/2019-07-04/rustc-beta-i686-unknown-freebsd.tar.gz) = 70869268
>-SHA256 (rust/2019-07-04/rust-std-beta-i686-unknown-freebsd.tar.gz) = d776bbe59bc1cd334f2426ed3a98d212d5362b193d249ade86d018dbdbda0982
>-SIZE (rust/2019-07-04/rust-std-beta-i686-unknown-freebsd.tar.gz) = 88588462
>-SHA256 (rust/2019-07-04/cargo-beta-i686-unknown-freebsd.tar.gz) = 29514179a34e0c31228b9dee0cefbb7c188ba327592d1bfa8bcd3567f2f79dc1
>-SIZE (rust/2019-07-04/cargo-beta-i686-unknown-freebsd.tar.gz) = 6600412
>+TIMESTAMP = 1562170805
>+SHA256 (rust/2019-07-04/rustc-nightly-src.tar.xz) = 3966a84964e557f25f090acc55cb7f06905f5392155c3212eeaa86460aa1bbdd
>+SIZE (rust/2019-07-04/rustc-nightly-src.tar.xz) = 98643404
>+SHA256 (rust/2019-05-23/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 5155fd888a153b77de49aa7bb61ee6cb142d695d259f552390f0aab2b4e753f9
>+SIZE (rust/2019-05-23/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 74106383
>+SHA256 (rust/2019-05-23/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 84af42671eed94e1cc2f0f504e52303cf1dc57f9e8c6a2f4768f5c99c3d73b1d
>+SIZE (rust/2019-05-23/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 85716443
>+SHA256 (rust/2019-05-23/cargo-beta-x86_64-unknown-freebsd.tar.gz) = c7b95d560e1abf2c27d8a9d93c9bf59a3847ee20b92e305a5f3b3d8b7a733876
>+SIZE (rust/2019-05-23/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 6432653
>+SHA256 (rust/2019-05-23/rustc-beta-i686-unknown-freebsd.tar.gz) = 0008614e9c37060bf7a6e4f81981a6a3d0f9fecd88edd0f14099e43bf931f8a5
>+SIZE (rust/2019-05-23/rustc-beta-i686-unknown-freebsd.tar.gz) = 74910490
>+SHA256 (rust/2019-05-23/rust-std-beta-i686-unknown-freebsd.tar.gz) = 084e36f9bda2d2699fec57b61bde853bb0627500e7f40d4f70bbf74b88e38bf1
>+SIZE (rust/2019-05-23/rust-std-beta-i686-unknown-freebsd.tar.gz) = 86286855
>+SHA256 (rust/2019-05-23/cargo-beta-i686-unknown-freebsd.tar.gz) = e055693e461a48eba28a98312df0abda645d06044696f429c4fbeb0278b0a4bc
>+SIZE (rust/2019-05-23/cargo-beta-i686-unknown-freebsd.tar.gz) = 6320345
>diff --git a/mail/nextcloud-mail/Makefile b/mail/nextcloud-mail/Makefile
>index 8bf4c8e01735..29674a2be68e 100644
>--- a/mail/nextcloud-mail/Makefile
>+++ b/mail/nextcloud-mail/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mail
>-PORTVERSION=	0.15.1
>+PORTVERSION=	0.14.0
> DISTVERSIONPREFIX=	v
> CATEGORIES=	mail
> MASTER_SITES=	https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/
>@@ -16,7 +16,7 @@ COMMENT=	Mail app for Nextcloud
> 
> LICENSE=	AGPLv3
> 
>-RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=16:www/nextcloud@${PHP_FLAVOR}
>+RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=15.9:www/nextcloud@${PHP_FLAVOR}
> 
> USES=		gettext php:flavors
> USE_PHP=	imap
>diff --git a/mail/nextcloud-mail/distinfo b/mail/nextcloud-mail/distinfo
>index 7f85ac3664e3..45ebc93e859c 100644
>--- a/mail/nextcloud-mail/distinfo
>+++ b/mail/nextcloud-mail/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562411254
>-SHA256 (nextcloud/mail-v0.15.1/mail.tar.gz) = 6fa8e498ec06ecff66ab53af271c60c68c114fd850c217bffaec4f4431ab76bb
>-SIZE (nextcloud/mail-v0.15.1/mail.tar.gz) = 3337484
>+TIMESTAMP = 1556198742
>+SHA256 (nextcloud/mail-v0.14.0/mail.tar.gz) = dbd6265fa45defde8472895220298dc954cf57cb7e3728c3315be8b5f53ed75f
>+SIZE (nextcloud/mail-v0.14.0/mail.tar.gz) = 3339912
>diff --git a/mail/nextcloud-mail/pkg-plist b/mail/nextcloud-mail/pkg-plist
>index 5fc3e02015a9..281cc4903980 100644
>--- a/mail/nextcloud-mail/pkg-plist
>+++ b/mail/nextcloud-mail/pkg-plist
>@@ -41,24 +41,22 @@
> %%WWWDIR%%/img/star.svg
> %%WWWDIR%%/img/trash.png
> %%WWWDIR%%/img/trash.svg
>-%%WWWDIR%%/js/mail.0.ec9ed56f4b49acd08381.js
>-%%WWWDIR%%/js/mail.0.ec9ed56f4b49acd08381.js.map
>-%%WWWDIR%%/js/mail.1.5b1a01708d0952c96a9d.js
>-%%WWWDIR%%/js/mail.1.5b1a01708d0952c96a9d.js.map
>-%%WWWDIR%%/js/mail.2.b0f836e1c36928aa0d7b.js
>-%%WWWDIR%%/js/mail.2.b0f836e1c36928aa0d7b.js.map
>-%%WWWDIR%%/js/mail.3.49d8ce2c011407d32488.js
>-%%WWWDIR%%/js/mail.3.49d8ce2c011407d32488.js.map
>-%%WWWDIR%%/js/mail.5.f379e732a0acda0aad0f.js
>-%%WWWDIR%%/js/mail.5.f379e732a0acda0aad0f.js.map
>-%%WWWDIR%%/js/mail.6.5a95cd0084d20237539d.js
>-%%WWWDIR%%/js/mail.6.5a95cd0084d20237539d.js.map
>-%%WWWDIR%%/js/mail.7.dbb0589ebd8de1afdf5d.js
>-%%WWWDIR%%/js/mail.7.dbb0589ebd8de1afdf5d.js.map
>-%%WWWDIR%%/js/mail.8.5d519b2d1fd8be86e18e.js
>-%%WWWDIR%%/js/mail.8.5d519b2d1fd8be86e18e.js.map
>-%%WWWDIR%%/js/mail.9.1139c8f9166a7337b1aa.js
>-%%WWWDIR%%/js/mail.9.1139c8f9166a7337b1aa.js.map
>+%%WWWDIR%%/js/0.mail.js
>+%%WWWDIR%%/js/0.mail.js.map
>+%%WWWDIR%%/js/1.mail.js
>+%%WWWDIR%%/js/1.mail.js.map
>+%%WWWDIR%%/js/2.mail.js
>+%%WWWDIR%%/js/2.mail.js.map
>+%%WWWDIR%%/js/4.mail.js
>+%%WWWDIR%%/js/4.mail.js.map
>+%%WWWDIR%%/js/5.mail.js
>+%%WWWDIR%%/js/5.mail.js.map
>+%%WWWDIR%%/js/6.mail.js
>+%%WWWDIR%%/js/6.mail.js.map
>+%%WWWDIR%%/js/7.mail.js
>+%%WWWDIR%%/js/7.mail.js.map
>+%%WWWDIR%%/js/8.mail.js
>+%%WWWDIR%%/js/8.mail.js.map
> %%WWWDIR%%/js/mail.js
> %%WWWDIR%%/js/mail.js.map
> %%WWWDIR%%/l10n/.gitkeep
>@@ -228,7 +226,6 @@
> %%WWWDIR%%/lib/Http/Middleware/ErrorMiddleware.php
> %%WWWDIR%%/lib/Http/ProxyDownloadResponse.php
> %%WWWDIR%%/lib/IMAP/FolderMapper.php
>-%%WWWDIR%%/lib/IMAP/FolderStats.php
> %%WWWDIR%%/lib/IMAP/IMAPClientFactory.php
> %%WWWDIR%%/lib/IMAP/MessageMapper.php
> %%WWWDIR%%/lib/IMAP/Sync/FavouritesMailboxSync.php
>diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
>index a39d7460a2fc..ffd8ba2cf9f1 100644
>--- a/mail/nmh/Makefile
>+++ b/mail/nmh/Makefile
>@@ -94,7 +94,8 @@ LDFLAGS+=	-g
> DEBUG_FLAGS+=	-O0 -Wall -Wextra -g
> .endif
> 
>-CONFLICTS_INSTALL=	ja-mh-[0-9]* pixie-* p5-Dist-Joseki-*
>+CONFLICTS=	ja-mh-[0-9]*
>+CONFLICTS_INSTALL=	pixie-* p5-Dist-Joseki-*
> 
> post-install:
> 	@${FIND} ${STAGEDIR}${ETCDIR} -type f -exec ${MV} {} {}-dist \;
>diff --git a/mail/openemm2013/Makefile b/mail/openemm2013/Makefile
>index 7fcf579d2efe..4ac8bb8956fc 100644
>--- a/mail/openemm2013/Makefile
>+++ b/mail/openemm2013/Makefile
>@@ -17,14 +17,13 @@ COMMENT=	OpenEMM a email marketing enterprise app
> LICENSE=	CPAL-1.0
> LICENSE_FILE=	${WRKSRC}/other/LICENSE.txt
> 
>-BROKEN=	depends on expired www/tomcat8
> BROKEN_powerpc64=	fails to build: gmake[1]: clang: Command not found
> 
> LIB_DEPENDS=	libslang.so:devel/libslang2 \
> 		libsa.so:net/ossp-sa
>-#BUILD_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
>+BUILD_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
> 		${ANT_CMD}:devel/apache-ant
>-#RUN_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
>+RUN_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
> 		py27-MySQLdb>=1.2.3:databases/py-MySQLdb
> 
> USES=	dos2unix gmake python:2.7,run
>diff --git a/mail/openemm2015/Makefile b/mail/openemm2015/Makefile
>index 2c134472d16a..aa04b8766248 100644
>--- a/mail/openemm2015/Makefile
>+++ b/mail/openemm2015/Makefile
>@@ -16,14 +16,13 @@ COMMENT=	OpenEMM a email marketing enterprise app
> LICENSE=	CPAL-1.0
> LICENSE_FILE=	${WRKSRC}/other/LICENSE.txt
> 
>-BROKEN=	depends on expired www/tomcat8
> BROKEN_powerpc64=	fails to build: gmake[1]: clang: Command not found
> 
> LIB_DEPENDS=	libslang.so:devel/libslang2 \
> 		libsa.so:net/ossp-sa
>-#BUILD_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
>+BUILD_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
> 		${ANT_CMD}:devel/apache-ant
>-#RUN_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
>+RUN_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat8 \
> 		py27-MySQLdb>=1.2.3:databases/py-MySQLdb
> 
> USES=	dos2unix gmake python:2.7,run
>diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
>index ff82df18d011..45c50d0e7444 100644
>--- a/mail/postfix/Makefile
>+++ b/mail/postfix/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	postfix
>-DISTVERSION=	3.4.6
>+DISTVERSION=	3.4.5
> PORTREVISION?=	0
> PORTEPOCH=	1
> CATEGORIES=	mail ipv6
>diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
>index 4b4623f2af34..0b023eab145a 100644
>--- a/mail/postfix/distinfo
>+++ b/mail/postfix/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1561851467
>-SHA256 (postfix/postfix-3.4.6.tar.gz) = d674a9b40602ee30420ee7ff93c3600e8913eeb2ea9bfb0ac1d140dac5dbe326
>-SIZE (postfix/postfix-3.4.6.tar.gz) = 4571771
>+TIMESTAMP = 1553956821
>+SHA256 (postfix/postfix-3.4.5.tar.gz) = 8b2ba54f9d2a049582a0ed3ee2dbe96ba57e278feea9cb4f80e1a61844e6319f
>+SIZE (postfix/postfix-3.4.5.tar.gz) = 4581301
>diff --git a/math/R-cran-KFAS/Makefile b/math/R-cran-KFAS/Makefile
>index 6497b612bafc..d934a6c3b9dd 100644
>--- a/math/R-cran-KFAS/Makefile
>+++ b/math/R-cran-KFAS/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	KFAS
>-PORTVERSION=	1.3.7
>+PORTVERSION=	1.3.3
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>diff --git a/math/R-cran-KFAS/distinfo b/math/R-cran-KFAS/distinfo
>index 0cd43590ba46..1a9e4b70041f 100644
>--- a/math/R-cran-KFAS/distinfo
>+++ b/math/R-cran-KFAS/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562411062
>-SHA256 (KFAS_1.3.7.tar.gz) = b3f72e0783864e1ea6fbf07c0c867c4bef293527902c7e1bbfbdb8c43982b7ae
>-SIZE (KFAS_1.3.7.tar.gz) = 626576
>+TIMESTAMP = 1537420000
>+SHA256 (KFAS_1.3.3.tar.gz) = 04505cc8602505665100ef2bcb6246882f5f96a35213f5cdb189aaaa39cdd608
>+SIZE (KFAS_1.3.3.tar.gz) = 627376
>diff --git a/math/R-cran-RcppArmadillo/Makefile b/math/R-cran-RcppArmadillo/Makefile
>index 772af8ca5541..c30ec3bc383c 100644
>--- a/math/R-cran-RcppArmadillo/Makefile
>+++ b/math/R-cran-RcppArmadillo/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	RcppArmadillo
>-PORTVERSION=	0.9.500.2.0
>+PORTVERSION=	0.9.200.4.0
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>diff --git a/math/R-cran-RcppArmadillo/distinfo b/math/R-cran-RcppArmadillo/distinfo
>index f91e53fc250d..9f587d22bdd3 100644
>--- a/math/R-cran-RcppArmadillo/distinfo
>+++ b/math/R-cran-RcppArmadillo/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562411780
>-SHA256 (RcppArmadillo_0.9.500.2.0.tar.gz) = 1b66fa0a49a8b048778f961de3ec2463a491718f1127a12da6329262cfbadbd3
>-SIZE (RcppArmadillo_0.9.500.2.0.tar.gz) = 1357320
>+TIMESTAMP = 1542517007
>+SHA256 (RcppArmadillo_0.9.200.4.0.tar.gz) = 7fbbfceecfade2479bdfa7aa49a45f82511a232026e2193acc583d48a2bfdbab
>+SIZE (RcppArmadillo_0.9.200.4.0.tar.gz) = 1314879
>diff --git a/math/R-cran-Rmpfr/Makefile b/math/R-cran-Rmpfr/Makefile
>index 9de8ac7dfc71..0dfa68953d80 100644
>--- a/math/R-cran-Rmpfr/Makefile
>+++ b/math/R-cran-Rmpfr/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	Rmpfr
>-DISTVERSION=	0.7-2
>+DISTVERSION=	0.7-1
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${DISTVERSION}
> 
>diff --git a/math/R-cran-Rmpfr/distinfo b/math/R-cran-Rmpfr/distinfo
>index 9edacf806ea0..b1d3918e44d2 100644
>--- a/math/R-cran-Rmpfr/distinfo
>+++ b/math/R-cran-Rmpfr/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562412806
>-SHA256 (Rmpfr_0.7-2.tar.gz) = ec1da6ec5292ea6ac95495c6a299591d367e520ae324719817fb884c865603ff
>-SIZE (Rmpfr_0.7-2.tar.gz) = 626031
>+TIMESTAMP = 1533978783
>+SHA256 (Rmpfr_0.7-1.tar.gz) = 9b3021617a22b0710b0f1acc279290762317ff123fd9e8fd03f1449f4bbfe204
>+SIZE (Rmpfr_0.7-1.tar.gz) = 622242
>diff --git a/math/R-cran-backports/Makefile b/math/R-cran-backports/Makefile
>index 0e615fbe72ed..7827ce4623d3 100644
>--- a/math/R-cran-backports/Makefile
>+++ b/math/R-cran-backports/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	backports
>-PORTVERSION=	1.1.4
>+PORTVERSION=	1.1.2
>+PORTREVISION=	2
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>diff --git a/math/R-cran-backports/distinfo b/math/R-cran-backports/distinfo
>index 5e78dd9dff13..d5f5586183c8 100644
>--- a/math/R-cran-backports/distinfo
>+++ b/math/R-cran-backports/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562414850
>-SHA256 (backports_1.1.4.tar.gz) = ee4b5efef22fa7ef27d7983ffcd31db52f81e1fbb7189c6e89ee09b69349ff03
>-SIZE (backports_1.1.4.tar.gz) = 13859
>+TIMESTAMP = 1520565513
>+SHA256 (backports_1.1.2.tar.gz) = e85b93675c6703e1da790dce1f8fb61f27b87e92722c7f0909273ed5074cb456
>+SIZE (backports_1.1.2.tar.gz) = 10900
>diff --git a/math/R-cran-ddalpha/Makefile b/math/R-cran-ddalpha/Makefile
>index 679a4e4bf73f..5207e2caa514 100644
>--- a/math/R-cran-ddalpha/Makefile
>+++ b/math/R-cran-ddalpha/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	ddalpha
>-PORTVERSION=	1.3.9
>+PORTVERSION=	1.3.4
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>diff --git a/math/R-cran-ddalpha/distinfo b/math/R-cran-ddalpha/distinfo
>index 3d00f04b67df..092da324e82c 100644
>--- a/math/R-cran-ddalpha/distinfo
>+++ b/math/R-cran-ddalpha/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562415489
>-SHA256 (ddalpha_1.3.9.tar.gz) = 62d95309c643c3da2708de8881a065fdf12e8086e3650062828377433703faef
>-SIZE (ddalpha_1.3.9.tar.gz) = 492630
>+TIMESTAMP = 1530435868
>+SHA256 (ddalpha_1.3.4.tar.gz) = 41ba9952deb2e81713f2e308357d3b7adfe348135ba7e3c94c347db5e0029699
>+SIZE (ddalpha_1.3.4.tar.gz) = 489090
>diff --git a/math/R-cran-deldir/Makefile b/math/R-cran-deldir/Makefile
>index a677567292f7..38ec0df2b228 100644
>--- a/math/R-cran-deldir/Makefile
>+++ b/math/R-cran-deldir/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	deldir
>-DISTVERSION=	0.1-22
>+DISTVERSION=	0.1-15
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${DISTVERSION}
> 
>diff --git a/math/R-cran-deldir/distinfo b/math/R-cran-deldir/distinfo
>index cd0e35f5c6b9..383e4a8da003 100644
>--- a/math/R-cran-deldir/distinfo
>+++ b/math/R-cran-deldir/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562415627
>-SHA256 (deldir_0.1-22.tar.gz) = f07204d7095c2c56288a7de91990b88424c3d1a0d6464296ffd93dbea8655919
>-SIZE (deldir_0.1-22.tar.gz) = 84215
>+TIMESTAMP = 1523432468
>+SHA256 (deldir_0.1-15.tar.gz) = 571011c208829f47ecd9f92a19fd94a8eb59de5a2645ab8c62e73926ade30710
>+SIZE (deldir_0.1-15.tar.gz) = 73895
>diff --git a/math/R-cran-dimRed/Makefile b/math/R-cran-dimRed/Makefile
>index 23d8626ad09b..dd70f11b137b 100644
>--- a/math/R-cran-dimRed/Makefile
>+++ b/math/R-cran-dimRed/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	dimRed
>-PORTVERSION=	0.2.3
>+PORTVERSION=	0.2.2
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>diff --git a/math/R-cran-dimRed/distinfo b/math/R-cran-dimRed/distinfo
>index 0440bf1480a7..d568d7062a16 100644
>--- a/math/R-cran-dimRed/distinfo
>+++ b/math/R-cran-dimRed/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562416156
>-SHA256 (dimRed_0.2.3.tar.gz) = e6e56e3f6999ebdc326e64ead5269f3aaf61dd587beefafb7536ac3890370d84
>-SIZE (dimRed_0.2.3.tar.gz) = 779881
>+TIMESTAMP = 1542520706
>+SHA256 (dimRed_0.2.2.tar.gz) = 8870efb113191c4cb13a38bb41eb8dc8e0888fa18be198b96adff81833165e6b
>+SIZE (dimRed_0.2.2.tar.gz) = 797821
>diff --git a/math/R-cran-expm/Makefile b/math/R-cran-expm/Makefile
>index 0c1dc6e18fbd..f148841ed9f1 100644
>--- a/math/R-cran-expm/Makefile
>+++ b/math/R-cran-expm/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	expm
>-DISTVERSION=	0.999-4
>+DISTVERSION=	0.999-3
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${DISTVERSION}
> 
>diff --git a/math/R-cran-expm/distinfo b/math/R-cran-expm/distinfo
>index 260311bfa733..a1cdf640e95d 100644
>--- a/math/R-cran-expm/distinfo
>+++ b/math/R-cran-expm/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562416621
>-SHA256 (expm_0.999-4.tar.gz) = 58d06427a08c9442462b00a5531e2575800be13ed450c5a1546261251e536096
>-SIZE (expm_0.999-4.tar.gz) = 137075
>+TIMESTAMP = 1537856622
>+SHA256 (expm_0.999-3.tar.gz) = 511bac5860cc5b3888bca626cdf23241b6118eabcc82d100935386039e516412
>+SIZE (expm_0.999-3.tar.gz) = 356450
>diff --git a/math/R-cran-forecast/Makefile b/math/R-cran-forecast/Makefile
>index fd1fcdf30153..a5a4ebf68d48 100644
>--- a/math/R-cran-forecast/Makefile
>+++ b/math/R-cran-forecast/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	forecast
>-PORTVERSION=	8.7
>+PORTVERSION=	8.4
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>@@ -19,6 +20,7 @@ CRAN_DEPENDS=	R-cran-colorspace>0:graphics/R-cran-colorspace \
> 		R-cran-timeDate>0:finance/R-cran-timeDate \
> 		R-cran-tseries>0:finance/R-cran-tseries \
> 		R-cran-urca>0:finance/R-cran-urca \
>+		R-cran-uroot>0:math/R-cran-uroot \
> 		R-cran-zoo>0:math/R-cran-zoo \
> 		R-cran-RcppArmadillo>=0.2.35:math/R-cran-RcppArmadillo
> BUILD_DEPENDS=	${CRAN_DEPENDS}
>diff --git a/math/R-cran-forecast/distinfo b/math/R-cran-forecast/distinfo
>index 2a130559bd4d..3dd9e2d8c616 100644
>--- a/math/R-cran-forecast/distinfo
>+++ b/math/R-cran-forecast/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562419023
>-SHA256 (forecast_8.7.tar.gz) = 0d3aec2d10e05cb7961695f0639d3c4b848dbfd4f551c7bc699b9f95e06e3a39
>-SIZE (forecast_8.7.tar.gz) = 909190
>+TIMESTAMP = 1530437476
>+SHA256 (forecast_8.4.tar.gz) = 695cdf0376f1f519a236bec52722c41ea5896f2064f1403d0ad4914c5611188f
>+SIZE (forecast_8.4.tar.gz) = 583218
>diff --git a/math/R-cran-gmp/Makefile b/math/R-cran-gmp/Makefile
>index c54783b7eedb..63229b80c7ec 100644
>--- a/math/R-cran-gmp/Makefile
>+++ b/math/R-cran-gmp/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	gmp
>-DISTVERSION=	0.5-13.5
>+DISTVERSION=	0.5-13.2
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${DISTVERSION}
> 
>diff --git a/math/R-cran-gmp/distinfo b/math/R-cran-gmp/distinfo
>index 4b7cd486eb88..a231bbfc4d6f 100644
>--- a/math/R-cran-gmp/distinfo
>+++ b/math/R-cran-gmp/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562429175
>-SHA256 (gmp_0.5-13.5.tar.gz) = f681ab2ff3d1e379ba8ac44a8abddd08d08170723e885abc0b469b6fa8fe5510
>-SIZE (gmp_0.5-13.5.tar.gz) = 133364
>+TIMESTAMP = 1531909514
>+SHA256 (gmp_0.5-13.2.tar.gz) = ae6b7ef8cdb67df7888aaa2b27ee387e3f4e11193e247d67d8385aa2b294a6f5
>+SIZE (gmp_0.5-13.2.tar.gz) = 131313
>diff --git a/math/R-cran-gtable/Makefile b/math/R-cran-gtable/Makefile
>index d2fe4cc8c9e8..e7d8e0cdc643 100644
>--- a/math/R-cran-gtable/Makefile
>+++ b/math/R-cran-gtable/Makefile
>@@ -1,7 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	gtable
>-PORTVERSION=	0.3.0
>+PORTVERSION=	0.2.0
>+PORTREVISION=	2
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>diff --git a/math/R-cran-gtable/distinfo b/math/R-cran-gtable/distinfo
>index 2e116702ffd6..2bd3e8f82296 100644
>--- a/math/R-cran-gtable/distinfo
>+++ b/math/R-cran-gtable/distinfo
>@@ -1,3 +1,2 @@
>-TIMESTAMP = 1562430315
>-SHA256 (gtable_0.3.0.tar.gz) = fd386cc4610b1cc7627dac34dba8367f7efe114b968503027fb2e1265c67d6d3
>-SIZE (gtable_0.3.0.tar.gz) = 368081
>+SHA256 (gtable_0.2.0.tar.gz) = 801e4869830ff3da1d38e41f5a2296a54fc10a7419c6ffb108582850c701e76f
>+SIZE (gtable_0.2.0.tar.gz) = 24157
>diff --git a/math/R-cran-gtable/pkg-descr b/math/R-cran-gtable/pkg-descr
>index b8df497498a5..652fbdaa1124 100644
>--- a/math/R-cran-gtable/pkg-descr
>+++ b/math/R-cran-gtable/pkg-descr
>@@ -1,3 +1,3 @@
> Tools to make it easier to work with "tables" of grobs.
> 
>-WWW: https://cran.r-project.org/web/packages/gtable/
>+WWW: http://cran.r-project.org/web/packages/gtable/
>diff --git a/math/R-cran-ipred/Makefile b/math/R-cran-ipred/Makefile
>index d7009f914f4d..d02e3bcf356e 100644
>--- a/math/R-cran-ipred/Makefile
>+++ b/math/R-cran-ipred/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	ipred
>-DISTVERSION=	0.9-9
>+DISTVERSION=	0.9-8
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${DISTVERSION}
> 
>diff --git a/math/R-cran-ipred/distinfo b/math/R-cran-ipred/distinfo
>index 46b0c5ac23d5..fd379c92e732 100644
>--- a/math/R-cran-ipred/distinfo
>+++ b/math/R-cran-ipred/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562431238
>-SHA256 (ipred_0.9-9.tar.gz) = 0da87a70730d5a60b97e46b2421088765e7d6a7cc2695757eba0f9d31d86416f
>-SIZE (ipred_0.9-9.tar.gz) = 176324
>+TIMESTAMP = 1541502609
>+SHA256 (ipred_0.9-8.tar.gz) = 9c1d11c3cb0d72be7870e70a216e589e403bbfee38c796fe75cd0611d878ac07
>+SIZE (ipred_0.9-8.tar.gz) = 185803
>diff --git a/math/R-cran-irlba/Makefile b/math/R-cran-irlba/Makefile
>index bfe5001a4d10..7d3904de9c9b 100644
>--- a/math/R-cran-irlba/Makefile
>+++ b/math/R-cran-irlba/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	irlba
>-PORTVERSION=	2.3.3
>+PORTVERSION=	2.3.2
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>diff --git a/math/R-cran-irlba/distinfo b/math/R-cran-irlba/distinfo
>index b4c3f6e69317..2358dce3b0ed 100644
>--- a/math/R-cran-irlba/distinfo
>+++ b/math/R-cran-irlba/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562431551
>-SHA256 (irlba_2.3.3.tar.gz) = 6ee233697bcd579813bd0af5e1f4e6dd1eea971e8919c748408130d970fef5c0
>-SIZE (irlba_2.3.3.tar.gz) = 234753
>+TIMESTAMP = 1520596864
>+SHA256 (irlba_2.3.2.tar.gz) = 3fdf2d8fefa6ab14cd0992740de7958f9f501c71aca93229f5eb03c54558fc38
>+SIZE (irlba_2.3.2.tar.gz) = 234721
>diff --git a/math/R-cran-lava/Makefile b/math/R-cran-lava/Makefile
>index 2a2239177eca..b74da4bbcf73 100644
>--- a/math/R-cran-lava/Makefile
>+++ b/math/R-cran-lava/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	lava
>-DISTVERSION=	1.6.5
>+DISTVERSION=	1.6.4
>+PORTREVISION=	1
> CATEGORIES=	math
> DISTNAME=	${PORTNAME}_${DISTVERSION}
> 
>diff --git a/math/R-cran-lava/distinfo b/math/R-cran-lava/distinfo
>index 67e78146410b..56ac36c59cf3 100644
>--- a/math/R-cran-lava/distinfo
>+++ b/math/R-cran-lava/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562432717
>-SHA256 (lava_1.6.5.tar.gz) = 0e7439592d9ca5a07f6a6cfad44866b9ead841a14b8cc420f9967a415ec3348f
>-SIZE (lava_1.6.5.tar.gz) = 775216
>+TIMESTAMP = 1544171813
>+SHA256 (lava_1.6.4.tar.gz) = 41c6eeb96eaef9e1bfb04b31f7203e250a5ea7e7860be4d95f7f96f2a8644718
>+SIZE (lava_1.6.4.tar.gz) = 867423
>diff --git a/math/coin-or-data-netlib/Makefile b/math/coin-or-data-netlib/Makefile
>index c9554fd7fc5c..62a5087f3584 100644
>--- a/math/coin-or-data-netlib/Makefile
>+++ b/math/coin-or-data-netlib/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	Data-Netlib
>-DISTVERSION=	1.2.8
>+DISTVERSION=	1.2.7
> CATEGORIES=	math
> MASTER_SITES=	https://www.coin-or.org/download/source/Data/
> PKGNAMEPREFIX=	coin-or-
>diff --git a/math/coin-or-data-netlib/distinfo b/math/coin-or-data-netlib/distinfo
>index 8ac8bb02cfa8..8a7028f0ba52 100644
>--- a/math/coin-or-data-netlib/distinfo
>+++ b/math/coin-or-data-netlib/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562382456
>-SHA256 (Data-Netlib-1.2.8.tgz) = f6358d756a1d0ae2ac159a422ceb661f080bf527f7b5a3e30320839beb8de3e4
>-SIZE (Data-Netlib-1.2.8.tgz) = 3968190
>+TIMESTAMP = 1544420597
>+SHA256 (Data-Netlib-1.2.7.tgz) = c3cc6abe8313e4c8a0f999281d66d1c6b0ff3f7b60c25133291663e74aac4796
>+SIZE (Data-Netlib-1.2.7.tgz) = 3961227
>diff --git a/math/octave-forge-symbolic/Makefile b/math/octave-forge-symbolic/Makefile
>index 11a21fc79945..fa7cf73bfb08 100644
>--- a/math/octave-forge-symbolic/Makefile
>+++ b/math/octave-forge-symbolic/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	octave-forge-symbolic
>-PORTVERSION=	2.8.0
>+PORTVERSION=	2.7.1
>+PORTREVISION=	3
> CATEGORIES=	math
> 
> MAINTAINER=	stephen@FreeBSD.org
>diff --git a/math/octave-forge-symbolic/distinfo b/math/octave-forge-symbolic/distinfo
>index 7d30a4d49e8e..ad14291171ab 100644
>--- a/math/octave-forge-symbolic/distinfo
>+++ b/math/octave-forge-symbolic/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562358053
>-SHA256 (octave-forge/symbolic-2.8.0.tar.gz) = 983ff3534387202be447d873100855fc2fb1fdbccd7ce02d890656435467c1bf
>-SIZE (octave-forge/symbolic-2.8.0.tar.gz) = 257186
>+TIMESTAMP = 1538786880
>+SHA256 (octave-forge/symbolic-2.7.1.tar.gz) = 1f371bd3cbdbeae2cb2ae0b727efc5d2ea09f005867a5935a2514d78eb4b6eb1
>+SIZE (octave-forge/symbolic-2.7.1.tar.gz) = 252044
>diff --git a/misc/zoneinfo/Makefile b/misc/zoneinfo/Makefile
>index 6d0ad72a007a..0cea0151d366 100644
>--- a/misc/zoneinfo/Makefile
>+++ b/misc/zoneinfo/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	zoneinfo
>-DISTVERSION=	2019b
>+DISTVERSION=	2019a
> CATEGORIES=	misc
> MASTER_SITES=	https://data.iana.org/time-zones/releases/ \
> 		ftp://ftp.iana.org/tz/releases/
>diff --git a/misc/zoneinfo/distinfo b/misc/zoneinfo/distinfo
>index 853403534538..a8b7704306c3 100644
>--- a/misc/zoneinfo/distinfo
>+++ b/misc/zoneinfo/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562366147
>-SHA256 (tzdata2019b.tar.gz) = 05d9092c90dcf9ec4f3ccfdea80c7dcea5e882b3b105c3422da172aaa9a50c64
>-SIZE (tzdata2019b.tar.gz) = 384667
>+TIMESTAMP = 1554251873
>+SHA256 (tzdata2019a.tar.gz) = 90366ddf4aa03e37a16cd49255af77f801822310b213f195e2206ead48c59772
>+SIZE (tzdata2019a.tar.gz) = 378961
>diff --git a/multimedia/Makefile b/multimedia/Makefile
>index 20a378646c03..a48b4f7c39d1 100644
>--- a/multimedia/Makefile
>+++ b/multimedia/Makefile
>@@ -27,7 +27,6 @@
>     SUBDIR += bitstream
>     SUBDIR += blind
>     SUBDIR += bsdbktr_tvtune
>-    SUBDIR += butt
>     SUBDIR += camserv
>     SUBDIR += ccextractor
>     SUBDIR += cclive
>diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
>index 467f3a91bbae..00df1535b9fa 100644
>--- a/multimedia/aom/Makefile
>+++ b/multimedia/aom/Makefile
>@@ -2,8 +2,8 @@
> 
> PORTNAME=	aom
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.0.0-2036
>-DISTVERSIONSUFFIX=	-ge2c1d5ef8
>+DISTVERSION=	1.0.0-2032
>+DISTVERSIONSUFFIX=	-g2dc8a3559
> CATEGORIES=	multimedia
> 
> MAINTAINER=	jbeich@FreeBSD.org
>diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
>index 33ace70e1543..006d71cc463c 100644
>--- a/multimedia/aom/distinfo
>+++ b/multimedia/aom/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562345267
>-SHA256 (jbeich-aom-v1.0.0-2036-ge2c1d5ef8_GH0.tar.gz) = f6b408556bba7948d1cc549f278c6ffa6bbf31699a9dd77e545c8b55a58f4f7e
>-SIZE (jbeich-aom-v1.0.0-2036-ge2c1d5ef8_GH0.tar.gz) = 3395471
>+TIMESTAMP = 1562189961
>+SHA256 (jbeich-aom-v1.0.0-2032-g2dc8a3559_GH0.tar.gz) = 913c3ea26676108a9b7a13a35de40a1af179842a2c8dbe5ad69f018043707228
>+SIZE (jbeich-aom-v1.0.0-2032-g2dc8a3559_GH0.tar.gz) = 3395395
>diff --git a/multimedia/butt/Makefile b/multimedia/butt/Makefile
>deleted file mode 100644
>index 955472137b86..000000000000
>--- a/multimedia/butt/Makefile
>+++ /dev/null
>@@ -1,32 +0,0 @@
>-# $FreeBSD$
>-
>-PORTNAME=	butt
>-PORTVERSION=	0.1.18
>-CATEGORIES=	multimedia graphics
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
>-
>-MAINTAINER=	pi@FreeBSD.org
>-COMMENT=	Broadcast SHOUTcast and Icecast streams
>-
>-LICENSE=	GPLv2
>-
>-LIB_DEPENDS=	libdbus-1.so:devel/dbus \
>-		libFLAC.so:audio/flac \
>-		libfdk-aac.so:audio/fdk-aac \
>-		libfltk_images.so:x11-toolkits/fltk \
>-		libfontconfig.so:x11-fonts/fontconfig \
>-		libmp3lame.so:audio/lame \
>-		libogg.so:audio/libogg \
>-		libopus.so:audio/opus \
>-		libpng16.so:graphics/png \
>-		libportaudio.so:audio/portaudio \
>-		libsamplerate.so:audio/libsamplerate \
>-		libvorbis.so:audio/libvorbis
>-
>-USES=		autoreconf compiler:c++11-lang gmake jpeg pkgconfig
>-USE_XORG=	x11 xrender xcursor xfixes xext xft xinerama
>-
>-GNU_CONFIGURE=	yes
>-PLIST_FILES=	bin/butt
>-
>-.include <bsd.port.mk>
>diff --git a/multimedia/butt/distinfo b/multimedia/butt/distinfo
>deleted file mode 100644
>index 6ad64ca60c4a..000000000000
>--- a/multimedia/butt/distinfo
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1562349284
>-SHA256 (butt-0.1.18.tar.gz) = e812b4058a85c7de3733ff85f513e24891afe541eac399cba535b44490c00595
>-SIZE (butt-0.1.18.tar.gz) = 968135
>diff --git a/multimedia/butt/files/patch-configure.ac b/multimedia/butt/files/patch-configure.ac
>deleted file mode 100644
>index 28451307eb62..000000000000
>--- a/multimedia/butt/files/patch-configure.ac
>+++ /dev/null
>@@ -1,56 +0,0 @@
>---- configure.ac.orig	2019-05-12 09:03:53 UTC
>-+++ configure.ac
>-@@ -61,6 +61,7 @@ AM_CONDITIONAL(WINDOWS, test "$host_os" = "windows")
>- 
>- 
>- build_linux=no
>-+build_freebsd=no
>- build_windows=no
>- build_mac=no
>- 
>-@@ -75,6 +76,15 @@ case "${host_os}" in
>- 			    )
>- 	])
>-         ;;
>-+	freebsd*)
>-+        build_freebsd=yes
>-+        AC_MSG_NOTICE([FreeBSD detected])
>-+	AS_IF([test "x$enable_aac" != "xno"], [
>-+	       AC_CHECK_LIB([fdk-aac], [aacEncOpen], [],
>-+			    [AC_MSG_ERROR([**** Could not find libfdk-aac     ****])]
>-+			    )
>-+	])
>-+        ;;
>-     cygwin*|mingw*|windows)
>-         build_windows=yes
>-         AC_MSG_NOTICE([Windows detected])
>-@@ -90,6 +100,7 @@ esac
>- 
>- # Pass the conditionals to automake
>- AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"])
>-+AM_CONDITIONAL([FREEBSD], [test "$build_freebsd" = "yes"])
>- AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"])
>- AM_CONDITIONAL([OSX], [test "$build_mac" = "yes"])
>- 
>-@@ -121,6 +132,21 @@ if test "$build_linux" = "yes"; then
>- 		AC_MSG_ERROR([**** Coud not find dbus dev files])
>- 	])
>- fi
>-+
>-+#Add dbus library for FreeBSD
>-+if test "$build_freebsd" = "yes"; then
>-+	AC_MSG_NOTICE([])
>-+	PKG_CHECK_MODULES([DBUS], [dbus-1], [
>-+		AC_DEFINE([HAVE_DBUS], [1], [Use dbus to get current tracks])
>-+		LIBS="$LIBS $DBUS_LIBS"
>-+		CFLAGS="$CFLAGS $LIBS $DBUS_CFLAGS"
>-+		CXXFLAGS="$CXXFLAGS $DBUS_CFLAGS"
>-+	], [
>-+		AC_DEFINE([HAVE_DBUS], [0], [Use dbus to get current tracks])
>-+		AC_MSG_ERROR([**** Coud not find dbus dev files])
>-+	])
>-+fi
>-+
>- 
>- # Checks for header files.
>- AC_PATH_X
>diff --git a/multimedia/butt/files/patch-src_Makefile.am b/multimedia/butt/files/patch-src_Makefile.am
>deleted file mode 100644
>index f182ba4b3039..000000000000
>--- a/multimedia/butt/files/patch-src_Makefile.am
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- src/Makefile.am.orig	2019-04-21 18:20:26 UTC
>-+++ src/Makefile.am
>-@@ -34,6 +34,10 @@ if LINUX
>- butt_SOURCES += currentTrack.h currentTrackLinux.cpp
>- endif
>- 
>-+if FREEBSD
>-+butt_SOURCES += currentTrack.h currentTrackLinux.cpp
>-+endif
>-+
>- # used only under MinGW to compile the resource.rc file (manifest and program icon)
>- 
>- .rc.o:
>diff --git a/multimedia/butt/pkg-descr b/multimedia/butt/pkg-descr
>deleted file mode 100644
>index 10a0886dded7..000000000000
>--- a/multimedia/butt/pkg-descr
>+++ /dev/null
>@@ -1,10 +0,0 @@
>-An easy to use, multi OS streaming tool. It supports SHOUTcast and Icecast.
>-
>-The main purpose of butt is to stream live audio data from your
>-computers Mic or Line input to an Shoutcast or Icecast server.
>-Recording is also possible.
>-
>-It is NOT intended to be a server by itself or automatically stream
>-a set of audio files.
>-
>-WWW: https://danielnoethen.de/butt/
>diff --git a/multimedia/kvazaar/Makefile b/multimedia/kvazaar/Makefile
>index f5d254b0ea49..10b8e112f1c6 100644
>--- a/multimedia/kvazaar/Makefile
>+++ b/multimedia/kvazaar/Makefile
>@@ -52,4 +52,5 @@ pre-install:	do-test
> .include <bsd.port.mk>
> 
> # XXX test_external_symbols.sh fails with CRYPTOPP=on
>+# XXX beefy5 (fails) vs. beefy4 (succeeds). Missed CPUID check?
> do-test:	.IGNORE
>diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
>index 23b4b2061df1..771c417fc6a6 100644
>--- a/multimedia/mencoder/distinfo
>+++ b/multimedia/mencoder/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562408261
>-SHA256 (mplayer-1.4.0.20190706.tar.xz) = c33f9f232ee7761f7a566ece33933306e0560a8ce027345c58e191bcf3bbec04
>-SIZE (mplayer-1.4.0.20190706.tar.xz) = 5187360
>+TIMESTAMP = 1561810492
>+SHA256 (mplayer-1.4.0.20190629.tar.xz) = 5cbc69dab01e8a697bb82709c942d4607ae230d317f8ac3759974377fe8db89c
>+SIZE (mplayer-1.4.0.20190629.tar.xz) = 5186648
>diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
>index cf9338b7518c..3f1b02e02d46 100644
>--- a/multimedia/mplayer/Makefile.common
>+++ b/multimedia/mplayer/Makefile.common
>@@ -5,7 +5,7 @@
> # $FreeBSD$
> 
> MPLAYER_PORT_VERSION=	1.4.0
>-MPLAYER_SNAPSHOT_DATE=	2019-07-06
>+MPLAYER_SNAPSHOT_DATE=	2019-06-29
> MASTER_SITES=	LOCAL/riggs/mplayer
> DISTNAME=	mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
> WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
>@@ -59,6 +59,9 @@ common-post-patch:
> 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
> 		-e 's|-liconv|${ICONV_LIB}|' \
> 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>+	@${REINPLACE_CMD} \
>+		-e 's|_mm_load_si128|_mm_loadu_si128|' \
>+		${WRKSRC}/sub/osd_template.c
> 	@${FIND} -E ${WRKSRC} -type f \
> 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
> 		${XARGS} -x -0 -n 10 \
>diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
>index 65c6e089cb07..7738bc7613e5 100644
>--- a/multimedia/mplayer/distinfo
>+++ b/multimedia/mplayer/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562408246
>-SHA256 (mplayer-1.4.0.20190706.tar.xz) = c33f9f232ee7761f7a566ece33933306e0560a8ce027345c58e191bcf3bbec04
>-SIZE (mplayer-1.4.0.20190706.tar.xz) = 5187360
>+TIMESTAMP = 1561810436
>+SHA256 (mplayer-1.4.0.20190629.tar.xz) = 5cbc69dab01e8a697bb82709c942d4607ae230d317f8ac3759974377fe8db89c
>+SIZE (mplayer-1.4.0.20190629.tar.xz) = 5186648
>diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile
>index 5baaad101233..be801b671a3a 100644
>--- a/multimedia/oggvideotools/Makefile
>+++ b/multimedia/oggvideotools/Makefile
>@@ -19,6 +19,8 @@ LIB_DEPENDS=	libgd.so:graphics/gd \
> 		libtheora.so:multimedia/libtheora \
> 		libvorbis.so:audio/libvorbis
> 
>+BROKEN_powerpc64=	fails to build: decoderTest.cpp: 'memset' was not declared in this scope
>+
> USES=		cmake compiler:c++11-lib localbase:ldflags pkgconfig tar:bz2
> USE_CXXSTD=	c++11
> USE_SDL=	sdl
>diff --git a/multimedia/oggvideotools/files/patch-src_base_test_decoderTest.cpp b/multimedia/oggvideotools/files/patch-src_base_test_decoderTest.cpp
>deleted file mode 100644
>index e5f81ae8ded6..000000000000
>--- a/multimedia/oggvideotools/files/patch-src_base_test_decoderTest.cpp
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- src/base/test/decoderTest.cpp.orig	2019-07-01 07:30:12 UTC
>-+++ src/base/test/decoderTest.cpp
>-@@ -5,6 +5,7 @@
>- #include "oggDecoder.h"
>- #include <vector>
>- #include <iostream>
>-+#include <cstring>
>- 
>- int main(int argc, char* argv[])
>- {
>diff --git a/multimedia/rav1e/Makefile b/multimedia/rav1e/Makefile
>index bda90b3a2dbc..a0ffc867302e 100644
>--- a/multimedia/rav1e/Makefile
>+++ b/multimedia/rav1e/Makefile
>@@ -1,7 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	rav1e
>-PORTVERSION=	s20190705
>+PORTVERSION=	s20190703
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> 
> MAINTAINER=	jbeich@FreeBSD.org
>@@ -16,7 +17,7 @@ BUILD_DEPENDS_amd64=	nasm:devel/nasm
> USES=		cargo
> USE_GITHUB=	yes
> GH_ACCOUNT=	xiph
>-GH_TAGNAME=	16ea18ea
>+GH_TAGNAME=	991f95b8
> PLIST_FILES=	bin/${PORTNAME}
> 
> CARGO_CRATES=	aho-corasick-0.7.4 \
>@@ -86,7 +87,7 @@ CARGO_CRATES=	aho-corasick-0.7.4 \
> 		peeking_take_while-0.1.2 \
> 		pkg-config-0.3.14 \
> 		pretty_assertions-0.6.1 \
>-		proc-macro-hack-0.5.8 \
>+		proc-macro-hack-0.5.7 \
> 		proc-macro2-0.4.30 \
> 		quick-error-1.2.2 \
> 		quote-0.6.12 \
>@@ -104,9 +105,9 @@ CARGO_CRATES=	aho-corasick-0.7.4 \
> 		rayon-1.1.0 \
> 		rayon-core-1.5.0 \
> 		rdrand-0.4.0 \
>-		redox_syscall-0.1.56 \
>+		redox_syscall-0.1.54 \
> 		redox_termios-0.1.1 \
>-		regex-1.1.8 \
>+		regex-1.1.7 \
> 		regex-automata-0.1.7 \
> 		regex-syntax-0.6.7 \
> 		rustc-demangle-0.1.15 \
>diff --git a/multimedia/rav1e/distinfo b/multimedia/rav1e/distinfo
>index dbd60eec90d5..4e9ff496fd8a 100644
>--- a/multimedia/rav1e/distinfo
>+++ b/multimedia/rav1e/distinfo
>@@ -1,4 +1,4 @@
>-TIMESTAMP = 1562368831
>+TIMESTAMP = 1562196683
> SHA256 (rust/crates/aho-corasick-0.7.4.tar.gz) = 36b7aa1ccb7d7ea3f437cf025a2ab1c47cc6c1bc9fc84918ff449def12f5e282
> SIZE (rust/crates/aho-corasick-0.7.4.tar.gz) = 55480
> SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
>@@ -133,8 +133,8 @@ SHA256 (rust/crates/pkg-config-0.3.14.tar.gz) = 676e8eb2b1b4c9043511a9b7bea09153
> SIZE (rust/crates/pkg-config-0.3.14.tar.gz) = 13565
> SHA256 (rust/crates/pretty_assertions-0.6.1.tar.gz) = 3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427
> SIZE (rust/crates/pretty_assertions-0.6.1.tar.gz) = 61551
>-SHA256 (rust/crates/proc-macro-hack-0.5.8.tar.gz) = 982a35d1194084ba319d65c4a68d24ca28f5fdb5b8bc20899e4eef8641ea5178
>-SIZE (rust/crates/proc-macro-hack-0.5.8.tar.gz) = 10816
>+SHA256 (rust/crates/proc-macro-hack-0.5.7.tar.gz) = 0c1dd4172a1e1f96f709341418f49b11ea6c2d95d53dca08c0f74cbd332d9cf3
>+SIZE (rust/crates/proc-macro-hack-0.5.7.tar.gz) = 10813
> SHA256 (rust/crates/proc-macro2-0.4.30.tar.gz) = cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759
> SIZE (rust/crates/proc-macro2-0.4.30.tar.gz) = 34731
> SHA256 (rust/crates/quick-error-1.2.2.tar.gz) = 9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0
>@@ -169,12 +169,12 @@ SHA256 (rust/crates/rayon-core-1.5.0.tar.gz) = ebbe0df8435ac0c397d467b6cad6d2554
> SIZE (rust/crates/rayon-core-1.5.0.tar.gz) = 61857
> SHA256 (rust/crates/rdrand-0.4.0.tar.gz) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2
> SIZE (rust/crates/rdrand-0.4.0.tar.gz) = 6456
>-SHA256 (rust/crates/redox_syscall-0.1.56.tar.gz) = 2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84
>-SIZE (rust/crates/redox_syscall-0.1.56.tar.gz) = 17117
>+SHA256 (rust/crates/redox_syscall-0.1.54.tar.gz) = 12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252
>+SIZE (rust/crates/redox_syscall-0.1.54.tar.gz) = 15668
> SHA256 (rust/crates/redox_termios-0.1.1.tar.gz) = 7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76
> SIZE (rust/crates/redox_termios-0.1.1.tar.gz) = 3227
>-SHA256 (rust/crates/regex-1.1.8.tar.gz) = 1325e8a57b7da4cbcb38b3957112f729990bad0a18420e7e250ef6b1d9a15763
>-SIZE (rust/crates/regex-1.1.8.tar.gz) = 246780
>+SHA256 (rust/crates/regex-1.1.7.tar.gz) = 0b2f0808e7d7e4fb1cb07feb6ff2f4bc827938f24f8c2e6a3beb7370af544bdd
>+SIZE (rust/crates/regex-1.1.7.tar.gz) = 243534
> SHA256 (rust/crates/regex-automata-0.1.7.tar.gz) = 3ed09217220c272b29ef237a974ad58515bde75f194e3ffa7e6d0bf0f3b01f86
> SIZE (rust/crates/regex-automata-0.1.7.tar.gz) = 92106
> SHA256 (rust/crates/regex-syntax-0.6.7.tar.gz) = 9d76410686f9e3a17f06128962e0ecc5755870bb890c34820c7af7f1db2e1d48
>@@ -255,5 +255,5 @@ SHA256 (rust/crates/wincolor-1.0.1.tar.gz) = 561ed901ae465d6185fa7864d63fbd5720d
> SIZE (rust/crates/wincolor-1.0.1.tar.gz) = 4737
> SHA256 (rust/crates/y4m-0.3.3.tar.gz) = b14191e41f540837886792294aa9269c2d63eb8733ed0499590935fef7bbb94f
> SIZE (rust/crates/y4m-0.3.3.tar.gz) = 11108
>-SHA256 (xiph-rav1e-s20190705-16ea18ea_GH0.tar.gz) = 6f1f66afc7d71da55dee48bf76cb3e7a451bb175bb1b9846de5e20f7949048c6
>-SIZE (xiph-rav1e-s20190705-16ea18ea_GH0.tar.gz) = 428203
>+SHA256 (xiph-rav1e-s20190703-991f95b8_GH0.tar.gz) = 9367593f24a06933aa6a2985a7a7681c4562fd36395e3b6445a62f589fc288bd
>+SIZE (xiph-rav1e-s20190703-991f95b8_GH0.tar.gz) = 427832
>diff --git a/multimedia/svt-av1/Makefile b/multimedia/svt-av1/Makefile
>index a3644ff12a60..b47fda15905a 100644
>--- a/multimedia/svt-av1/Makefile
>+++ b/multimedia/svt-av1/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	svt-av1
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.6.0-16
>-DISTVERSIONSUFFIX=	-g41b37cbe
>+DISTVERSION=	0.6.0
> CATEGORIES=	multimedia
> 
> MAINTAINER=	jbeich@FreeBSD.org
>diff --git a/multimedia/svt-av1/distinfo b/multimedia/svt-av1/distinfo
>index 36e1f755032e..1084d7899ba5 100644
>--- a/multimedia/svt-av1/distinfo
>+++ b/multimedia/svt-av1/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562356460
>-SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0-16-g41b37cbe_GH0.tar.gz) = 3c699464db20629bf7e5e34410998c559108646b3b1e01d15c0a3b1e203a80e3
>-SIZE (OpenVisualCloud-SVT-AV1-v0.6.0-16-g41b37cbe_GH0.tar.gz) = 2634906
>+TIMESTAMP = 1562093686
>+SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0_GH0.tar.gz) = 4ff6f05a9528fe8a7b3d6708fe1115d15d26a5a9b0b676d8a250a0b2e8630579
>+SIZE (OpenVisualCloud-SVT-AV1-v0.6.0_GH0.tar.gz) = 2614429
>diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
>index a96c24be914d..d2d607e9a401 100644
>--- a/multimedia/vlc/Makefile
>+++ b/multimedia/vlc/Makefile
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	vlc
> DISTVERSION=	3.0.7.1
>-PORTREVISION=	1
> PORTEPOCH=	4
> CATEGORIES=	multimedia audio ipv6 net www
> MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
>diff --git a/net-mgmt/ccnet-server/Makefile b/net-mgmt/ccnet-server/Makefile
>index 1d0ca9776196..4872d3dc0e2f 100644
>--- a/net-mgmt/ccnet-server/Makefile
>+++ b/net-mgmt/ccnet-server/Makefile
>@@ -20,8 +20,8 @@ LIB_DEPENDS=	libsearpc.so:devel/libsearpc \
> 		libevent.so:devel/libevent \
> 		libjansson.so:devel/jansson
> 
>-USES=		autoreconf compiler:c11 gnome libtool localbase mysql:client \
>-		pathfix pgsql pkgconfig python:-2.7 shebangfix ssl
>+USES=		autoreconf gnome libtool localbase mysql:client pathfix \
>+		pgsql pkgconfig python:-2.7 shebangfix ssl
> USE_GITHUB=	yes
> GH_ACCOUNT=	haiwen
> USE_GNOME=	glib20
>diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
>index 3f16f888b61e..7fdfd9b49fa3 100644
>--- a/net-mgmt/collectd5/Makefile
>+++ b/net-mgmt/collectd5/Makefile
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	collectd
> PORTVERSION=	5.9.0
>-PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
> PKGNAMESUFFIX=	5
>diff --git a/net-mgmt/nagios-check_ports/Makefile b/net-mgmt/nagios-check_ports/Makefile
>index a53335d55889..8241302af924 100644
>--- a/net-mgmt/nagios-check_ports/Makefile
>+++ b/net-mgmt/nagios-check_ports/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	check_ports
>-PORTVERSION=	0.7.4
>+PORTVERSION=	0.7.3
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net-mgmt
> PKGNAMEPREFIX=	nagios-
>diff --git a/net-mgmt/nagios-check_ports/distinfo b/net-mgmt/nagios-check_ports/distinfo
>index 6be61599cfd2..773d85381566 100644
>--- a/net-mgmt/nagios-check_ports/distinfo
>+++ b/net-mgmt/nagios-check_ports/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562379851
>-SHA256 (rfrederick-check_ports-v0.7.4_GH0.tar.gz) = e83fdc3bdeaec6f95a52ada2cfb333fdc8ab81099f0f425d87001b6be25f9e4c
>-SIZE (rfrederick-check_ports-v0.7.4_GH0.tar.gz) = 5214
>+TIMESTAMP = 1498726235
>+SHA256 (rfrederick-check_ports-v0.7.3_GH0.tar.gz) = ca1c7044ccc95e5208cefffd3917e8ac5a8ffd6316ca0dd1bdfc0d0867f3dea3
>+SIZE (rfrederick-check_ports-v0.7.3_GH0.tar.gz) = 5141
>diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
>index ffc7755df01a..fb10ef908c5d 100644
>--- a/net-p2p/bitcoin/Makefile
>+++ b/net-p2p/bitcoin/Makefile
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	bitcoin
> PORTVERSION=	0.18.0
>-PORTREVISION=	1
> CATEGORIES=	net-p2p finance
> MASTER_SITES=	https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/ \
> 		LOCAL/swills:icon
>diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile
>index 5812233a86be..9a737be32a31 100644
>--- a/net-p2p/litecoin/Makefile
>+++ b/net-p2p/litecoin/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	litecoin
> PORTVERSION=	0.16.3
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	7
>+PORTREVISION=	6
> CATEGORIES=	net-p2p finance
> 
> MAINTAINER=	ports@FreeBSD.org
>diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile
>index b457647c570c..1d2aca9988a8 100644
>--- a/net-p2p/namecoin/Makefile
>+++ b/net-p2p/namecoin/Makefile
>@@ -4,7 +4,7 @@
> PORTNAME=	namecoin
> PORTVERSION=	0.17.0
> DISTVERSIONPREFIX=	nc
>-PORTREVISION=	7
>+PORTREVISION=	6
> PORTEPOCH=	1
> CATEGORIES=	net-p2p dns
> 
>diff --git a/net-p2p/qtum/Makefile b/net-p2p/qtum/Makefile
>index d248c0d069f8..85ff6c9df51a 100644
>--- a/net-p2p/qtum/Makefile
>+++ b/net-p2p/qtum/Makefile
>@@ -4,7 +4,6 @@
> PORTNAME=	qtum
> PORTVERSION=	0.17.6
> DISTVERSIONPREFIX=	mainnet-ignition-v
>-PORTREVISION=	1
> CATEGORIES=	net-p2p finance
> 
> MAINTAINER=	vd@FreeBSD.org
>diff --git a/net/bredbandskollen/Makefile b/net/bredbandskollen/Makefile
>index 896e7c58d731..3a20be52d35a 100644
>--- a/net/bredbandskollen/Makefile
>+++ b/net/bredbandskollen/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	bredbandskollen
>-PORTVERSION=	0.20181210
>+PORTVERSION=	0.20190705
> CATEGORIES=	net
> 
> MAINTAINER=	zeising@FreeBSD.org
>@@ -9,12 +9,12 @@ COMMENT=	Command line tool to check internet connection speed
> 
> LICENSE=	GPLv2
> 
>-USES=		gmake
>+USES=		compiler:c++11-lang gmake
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	dotse
> GH_PROJECT=	bbk
>-GH_TAGNAME=	39b47a1
>+GH_TAGNAME=	7b810a6
> 
> BUILD_WRKSRC=	${WRKSRC}/src/cli
> 
>@@ -26,8 +26,18 @@ OPTIONS_DEFINE=	GNUTLS
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
> GNUTLS_MAKE_ARGS=	GNUTLS=1
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH:Mpowerpc*}
>+EXTRA_PATCHES=	${FILESDIR}/extra-src_framework_socketreceiver.h
>+.endif
>+
>+post-patch:
>+	${REINPLACE_CMD} -e 's/CXX = c++/CXX ?= c++/g' \
>+	${WRKSRC}/src/framework/mk.inc
>+
> do-install:
> 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/cli ${STAGEDIR}/${PREFIX}/bin/bbk_cli
> 	${LN} -sf bbk_cli ${STAGEDIR}/${PREFIX}/bin/bredbandskollen
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff --git a/net/bredbandskollen/distinfo b/net/bredbandskollen/distinfo
>index a66e392007c0..293749b8c272 100644
>--- a/net/bredbandskollen/distinfo
>+++ b/net/bredbandskollen/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1544469797
>-SHA256 (dotse-bbk-0.20181210-39b47a1_GH0.tar.gz) = 20e66a5acb806125dca45fc2563bea28b308f90873c85a4b109db6a067b91147
>-SIZE (dotse-bbk-0.20181210-39b47a1_GH0.tar.gz) = 3636881
>+TIMESTAMP = 1562346059
>+SHA256 (dotse-bbk-0.20190705-7b810a6_GH0.tar.gz) = 69e09fb17ce3f4efc586ad5529b2205b060d6183cb3334f57dabb16302ef82dd
>+SIZE (dotse-bbk-0.20190705-7b810a6_GH0.tar.gz) = 133836
>diff --git a/net/bredbandskollen/files/extra-src_framework_socketreceiver.h b/net/bredbandskollen/files/extra-src_framework_socketreceiver.h
>new file mode 100644
>index 000000000000..48e009b4e424
>--- /dev/null
>+++ b/net/bredbandskollen/files/extra-src_framework_socketreceiver.h
>@@ -0,0 +1,12 @@
>+--- src/framework/socketreceiver.h.orig	2019-07-05 19:04:13 UTC
>++++ src/framework/socketreceiver.h
>+@@ -3,6 +3,9 @@
>+ 
>+ #pragma once
>+ 
>++// work around broken? _ALIGN/_ALIGNBYTES on FreeBSD powerpc
>++#include <sys/types.h>
>++
>+ #include <sys/socket.h>
>+ #include "serversocket.h"
>+ class SocketConnection;
>diff --git a/net/bredbandskollen/files/patch-src_framework_engine.h b/net/bredbandskollen/files/patch-src_framework_engine.h
>new file mode 100644
>index 000000000000..eb2fd844f5fa
>--- /dev/null
>+++ b/net/bredbandskollen/files/patch-src_framework_engine.h
>@@ -0,0 +1,11 @@
>+--- src/framework/engine.h.orig	2019-07-05 17:52:32 UTC
>++++ src/framework/engine.h
>+@@ -6,6 +6,8 @@
>+ 
>+ #pragma once
>+ 
>++#include <sys/select.h>
>++
>+ #include <thread>
>+ #include <map>
>+ #include <vector>
>diff --git a/net/eternalterminal/Makefile b/net/eternalterminal/Makefile
>index 908e9ccd08a2..d412c51910f8 100644
>--- a/net/eternalterminal/Makefile
>+++ b/net/eternalterminal/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	eternalterminal
> DISTVERSIONPREFIX=	et-v
> DISTVERSION=	5.1.9
>-PORTREVISION=	2
>+PORTREVISION=	1
> CATEGORIES=	net
> 
> MAINTAINER=	trevis@silencedpoet.com
>diff --git a/net/mosh/Makefile b/net/mosh/Makefile
>index 1a4dff2acbce..11e7acd73538 100644
>--- a/net/mosh/Makefile
>+++ b/net/mosh/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mosh
> PORTVERSION=	1.3.2
>-PORTREVISION=	9
>+PORTREVISION=	8
> CATEGORIES=	net
> MASTER_SITES=	https://mosh.org/ \
> 		ZI
>diff --git a/net/p5-Net-OAuth/Makefile b/net/p5-Net-OAuth/Makefile
>index ff98c36e64ad..93e1dd6d8e7b 100644
>--- a/net/p5-Net-OAuth/Makefile
>+++ b/net/p5-Net-OAuth/Makefile
>@@ -21,9 +21,7 @@ RUN_DEPENDS=	p5-Class-Accessor>=0.31:devel/p5-Class-Accessor \
> 		p5-URI>=1.35:net/p5-URI
> TEST_DEPENDS=	p5-Test-Warn>=0.21:devel/p5-Test-Warn
> 
>-USES=		perl5
> USE_PERL5=	modbuild
>-
>-NO_ARCH=	yes
>+USES=		perl5
> 
> .include <bsd.port.mk>
>diff --git a/net/p5-URI-ws/Makefile b/net/p5-URI-ws/Makefile
>index 3cc557a0c7d6..81817e8bea95 100644
>--- a/net/p5-URI-ws/Makefile
>+++ b/net/p5-URI-ws/Makefile
>@@ -16,9 +16,7 @@ LICENSE_COMB=	dual
> BUILD_DEPENDS=	${RUN_DEPENDS}
> RUN_DEPENDS=	p5-URI>=0:net/p5-URI
> 
>-USES=		perl5
> USE_PERL5=	configure
>-
>-NO_ARCH=	yes
>+USES=		perl5
> 
> .include <bsd.port.mk>
>diff --git a/net/quagga/Makefile b/net/quagga/Makefile
>index 5284fdf76fa6..d24254993362 100644
>--- a/net/quagga/Makefile
>+++ b/net/quagga/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	quagga
> PORTVERSION=	1.2.4
>-PORTREVISION=	6
>+PORTREVISION=	5
> CATEGORIES=	net ipv6
> MASTER_SITES=	SAVANNAH
> 
>diff --git a/net/quagga/files/patch-lib_thread.c b/net/quagga/files/patch-lib_thread.c
>deleted file mode 100644
>index fdfe14662332..000000000000
>--- a/net/quagga/files/patch-lib_thread.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- lib/thread.c.orig	2018-02-19 21:24:55 UTC
>-+++ lib/thread.c
>-@@ -603,6 +603,8 @@ thread_add_fd (struct thread **thread_ar
>- static void
>- thread_add_unuse (struct thread *thread)
>- {
>-+  if (thread->type == THREAD_UNUSED)
>-+	return;
>-   thread->type = THREAD_UNUSED;
>-   assert (thread->master != NULL && thread != NULL);
>-   assert (thread->next == NULL);
>diff --git a/net/serviio/Makefile b/net/serviio/Makefile
>index 55557aca1502..ac27221a516e 100644
>--- a/net/serviio/Makefile
>+++ b/net/serviio/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	serviio
>-PORTVERSION=	2.0
>+PORTVERSION=	1.10.1
> #PORTREVISION=	1
> CATEGORIES=	net multimedia java www
> MASTER_SITES=	http://download.serviio.org/releases/
>@@ -43,10 +43,4 @@ do-install:
> 		${STAGEDIR}${ETCDIR}/console-log4j.properties.sample
> 	${INSTALL_SCRIPT} ${WRKDIR}/serviiod ${STAGEDIR}${PREFIX}/sbin
> 
>-# to be used with a non-standard PREFIX for just this port
>-# e.g. PREFIX=/porttest
>-mkplist:
>-	${FIND} ${STAGEDIR}${PREFIX}/ -type f | ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; s:share/java/classes:%%JAVAJARDIR%%:g ; s:etc/serviio:@sample %%ETCDIR%%:g" | ${GREP} -v etc/rc.d | ${SORT} >${PLIST}.new
>-#	${FIND} ${STAGEDIR}${PREFIX}/ -type d | ${SED} -e "s:${STAGEDIR}${PREFIX}/:@dirrm :g ; s:etc/serviio:%%ETCDIR%%:g ; s:share/java/classes:%%JAVAJARDIR%%:g" | ${SORT} -r >>${PLIST}.new
>-
> .include <bsd.port.mk>
>diff --git a/net/serviio/distinfo b/net/serviio/distinfo
>index 1d763050fbef..a95189ef116e 100644
>--- a/net/serviio/distinfo
>+++ b/net/serviio/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562247551
>-SHA256 (serviio-2.0-linux.tar.gz) = cfdae264b7d336a4a63f6a201b20b7881f32e310fad40db805d6f576415701ff
>-SIZE (serviio-2.0-linux.tar.gz) = 29345082
>+TIMESTAMP = 1546375066
>+SHA256 (serviio-1.10.1-linux.tar.gz) = d8742e9159aba9c76e70a8e002c8d0455564dcf63f6211f7ee206ffe6b12aa3f
>+SIZE (serviio-1.10.1-linux.tar.gz) = 28413154
>diff --git a/net/serviio/pkg-plist b/net/serviio/pkg-plist
>index b4bc97d0f6f3..3d73455d4a36 100644
>--- a/net/serviio/pkg-plist
>+++ b/net/serviio/pkg-plist
>@@ -1,13 +1,13 @@
>-%%JAVAJARDIR%%/serviio/activation.jar
>+sbin/serviiod
> %%JAVAJARDIR%%/serviio/aspectjrt.jar
> %%JAVAJARDIR%%/serviio/aspectjweaver.jar
> %%JAVAJARDIR%%/serviio/commons-codec.jar
> %%JAVAJARDIR%%/serviio/commons-imaging.jar
> %%JAVAJARDIR%%/serviio/commons-io.jar
>-%%JAVAJARDIR%%/serviio/commons-jcs-core.jar
> %%JAVAJARDIR%%/serviio/commons-jxpath.jar
> %%JAVAJARDIR%%/serviio/commons-lang.jar
> %%JAVAJARDIR%%/serviio/commons-logging.jar
>+%%JAVAJARDIR%%/serviio/concurrent.jar
> %%JAVAJARDIR%%/serviio/derby.jar
> %%JAVAJARDIR%%/serviio/freemarker.jar
> %%JAVAJARDIR%%/serviio/groovy-all.jar
>@@ -20,13 +20,13 @@
> %%JAVAJARDIR%%/serviio/jaudiotagger.jar
> %%JAVAJARDIR%%/serviio/javax.xml.soap-api.jar
> %%JAVAJARDIR%%/serviio/jcl-over-slf4j.jar
>+%%JAVAJARDIR%%/serviio/jcs.jar
> %%JAVAJARDIR%%/serviio/jdom.jar
> %%JAVAJARDIR%%/serviio/jnat-pmplib.jar
> %%JAVAJARDIR%%/serviio/jul-to-slf4j.jar
> %%JAVAJARDIR%%/serviio/log4j.jar
> %%JAVAJARDIR%%/serviio/lucene-analyzers-common.jar
> %%JAVAJARDIR%%/serviio/lucene-core.jar
>-%%JAVAJARDIR%%/serviio/mimepull.jar
> %%JAVAJARDIR%%/serviio/org.restlet.ext.gson.jar
> %%JAVAJARDIR%%/serviio/org.restlet.ext.simple.jar
> %%JAVAJARDIR%%/serviio/org.restlet.ext.slf4j.jar
>@@ -35,7 +35,6 @@
> %%JAVAJARDIR%%/serviio/padlock.jar
> %%JAVAJARDIR%%/serviio/rome-modules.jar
> %%JAVAJARDIR%%/serviio/rome.jar
>-%%JAVAJARDIR%%/serviio/saaj-impl.jar
> %%JAVAJARDIR%%/serviio/sbbi-upnp.jar
> %%JAVAJARDIR%%/serviio/serviio-mediabrowser-api.jar
> %%JAVAJARDIR%%/serviio/serviio-mediabrowser-web.jar
>@@ -45,13 +44,11 @@
> %%JAVAJARDIR%%/serviio/simple.jar
> %%JAVAJARDIR%%/serviio/slf4j-api.jar
> %%JAVAJARDIR%%/serviio/slf4j-log4j12.jar
>-%%JAVAJARDIR%%/serviio/stax-api.jar
>-%%JAVAJARDIR%%/serviio/stax-ex.jar
> %%JAVAJARDIR%%/serviio/streamflyer-core.jar
> %%JAVAJARDIR%%/serviio/winp.jar
> %%JAVAJARDIR%%/serviio/xstream.jar
>+@sample %%ETCDIR%%/profiles.xml.sample
>+@sample %%ETCDIR%%/log4j.xml.sample
> @sample %%ETCDIR%%/application-profiles.xml.sample
> @sample %%ETCDIR%%/console-log4j.properties.sample
>-@sample %%ETCDIR%%/log4j.xml.sample
>-@sample %%ETCDIR%%/profiles.xml.sample
>-sbin/serviiod
>+@comment @dir %%JAVAJARDIR%%/serviio/plugins
>diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile
>index 40467671db65..c85a462ebc70 100644
>--- a/net/spoofer/Makefile
>+++ b/net/spoofer/Makefile
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	spoofer
> PORTVERSION=	1.4.5
>-PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	https://www.caida.org/projects/spoofer/downloads/
> 
>diff --git a/net/waypipe/Makefile b/net/waypipe/Makefile
>index 4bbaf87c01f0..f28bb3192929 100644
>--- a/net/waypipe/Makefile
>+++ b/net/waypipe/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	waypipe
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.3.0
>+DISTVERSION=	0.2.0-31
> CATEGORIES=	net
> 
> MAINTAINER=	jbeich@FreeBSD.org
>@@ -19,7 +19,7 @@ USES=		compiler:c11 meson pkgconfig
> USE_GITLAB=	yes
> GL_SITE=	https://gitlab.freedesktop.org
> GL_ACCOUNT=	mstoeckl
>-GL_COMMIT=	8cf7845e63470490af3af95e178ba5fa74d8056b
>+GL_COMMIT=	a4b8d6b284882f0d8298bb0ba8cd31eea92bc447
> PLIST_FILES=	bin/${PORTNAME}
> 
> OPTIONS_DEFINE=	DMABUF FFMPEG LZ4 MANPAGES ZSTD
>diff --git a/net/waypipe/distinfo b/net/waypipe/distinfo
>index 045d61c6873d..0795428d9ce1 100644
>--- a/net/waypipe/distinfo
>+++ b/net/waypipe/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562359126
>-SHA256 (mstoeckl-waypipe-8cf7845e63470490af3af95e178ba5fa74d8056b_GL0.tar.gz) = b1db24d2b9cab37ac4eae05ca0c6d8d27faee3121d2bc025ec56ebcb0ae4fcb7
>-SIZE (mstoeckl-waypipe-8cf7845e63470490af3af95e178ba5fa74d8056b_GL0.tar.gz) = 110108
>+TIMESTAMP = 1562088104
>+SHA256 (mstoeckl-waypipe-a4b8d6b284882f0d8298bb0ba8cd31eea92bc447_GL0.tar.gz) = 7490089b21f07ccc8a3cdb6d7ff1dea1a52e16258b4d95ca657d92b933ffeae1
>+SIZE (mstoeckl-waypipe-a4b8d6b284882f0d8298bb0ba8cd31eea92bc447_GL0.tar.gz) = 99217
>diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
>index 6a91a2ac6d64..9298046ca42c 100644
>--- a/print/cups-filters/Makefile
>+++ b/print/cups-filters/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cups-filters
>-PORTVERSION=	1.25.1
>+PORTVERSION=	1.25.0
> CATEGORIES=	print
> MASTER_SITES=	https://www.openprinting.org/download/cups-filters/
> 
>diff --git a/print/cups-filters/distinfo b/print/cups-filters/distinfo
>index aa6a8d21488e..a18e4876db0a 100644
>--- a/print/cups-filters/distinfo
>+++ b/print/cups-filters/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562427808
>-SHA256 (cups-filters-1.25.1.tar.xz) = 1a09cc121d76f762e4bed6d3499499957935cbf3b5ec06765bd932692521985a
>-SIZE (cups-filters-1.25.1.tar.xz) = 1447208
>+TIMESTAMP = 1559988815
>+SHA256 (cups-filters-1.25.0.tar.xz) = 8119149a8b61466e94c141205a5a9d2de798fe7a932a260ce2d66f8f30d351d1
>+SIZE (cups-filters-1.25.0.tar.xz) = 1447496
>diff --git a/science/lm/Makefile b/science/lm/Makefile
>index a1995957b780..79b18f7872c6 100644
>--- a/science/lm/Makefile
>+++ b/science/lm/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	lm
> DISTVERSION=	2.3.0
> DISTVERSIONSUFFIX=	-src
>-PORTREVISION=	7
>+PORTREVISION=	6
> CATEGORIES=	science
> MASTER_SITES=	http://scs.illinois.edu/schulten/${PORTNAME}/download/${PORTNAME}${DISTVERSION:R:S/.//}/
> PKGNAMESUFFIX=	-uiuc
>diff --git a/science/paraview/Makefile b/science/paraview/Makefile
>index e6404d0508be..757c620b53de 100644
>--- a/science/paraview/Makefile
>+++ b/science/paraview/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	paraview
> DISTVERSION=	5.6.0
>-PORTREVISION=	2
>+PORTREVISION=	1
> CATEGORIES=	science graphics
> MASTER_SITES=	http://www.paraview.org/files/v${VERMAJORMINOR}/
> DISTNAME=	ParaView-v${PORTVERSION}
>diff --git a/science/py-spglib/Makefile b/science/py-spglib/Makefile
>index 6032f859f7e2..aa668ff221ac 100644
>--- a/science/py-spglib/Makefile
>+++ b/science/py-spglib/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	spglib
>-DISTVERSION=	1.13.0
>+DISTVERSION=	1.12.2
> DISTVERSIONSUFFIX=	.post0
> CATEGORIES=	science python
> MASTER_SITES=	CHEESESHOP
>diff --git a/science/py-spglib/distinfo b/science/py-spglib/distinfo
>index 31602245ddc6..e6e11aafd631 100644
>--- a/science/py-spglib/distinfo
>+++ b/science/py-spglib/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562381727
>-SHA256 (spglib-1.13.0.post0.tar.gz) = aef9ac09e985da608dd6b3b9efb4bee7adba074a08689b21b50cab0e9f5c0d62
>-SIZE (spglib-1.13.0.post0.tar.gz) = 691871
>+TIMESTAMP = 1554604422
>+SHA256 (spglib-1.12.2.post0.tar.gz) = 15b02b74c0f06179bc3650c43a710a5200abbba387c6eda3105bfd9236041443
>+SIZE (spglib-1.12.2.post0.tar.gz) = 710308
>diff --git a/security/certificate-transparency/Makefile b/security/certificate-transparency/Makefile
>index c361d73e85ad..404b3817eeeb 100644
>--- a/security/certificate-transparency/Makefile
>+++ b/security/certificate-transparency/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	certificate-transparency
> PORTVERSION=	20161015
>-PORTREVISION=	34
>+PORTREVISION=	33
> CATEGORIES=	security
> 
> MAINTAINER=	ports@FreeBSD.org
>diff --git a/security/snortreport/Makefile b/security/snortreport/Makefile
>index 4da998be2676..b3ebc2726e94 100644
>--- a/security/snortreport/Makefile
>+++ b/security/snortreport/Makefile
>@@ -11,9 +11,6 @@ COMMENT=	Add-on module for snort to generate real-time web reports
> 
> LICENSE=	GPLv2
> 
>-DEPRECATED=	Abandonware
>-EXPIRATION_DATE=	2019-07-15
>-
> OPTIONS_DEFINE=		BARNYARD JPGRAPH MYSQL PGSQL DOCS
> 
> BARNYARD_DESC=		Depend on Barnyard2
>diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
>index 8e5bc0f8295d..c6e2447a22be 100644
>--- a/security/sshguard/Makefile
>+++ b/security/sshguard/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	sshguard
>-PORTVERSION=	2.4.0
>+PORTVERSION=	2.3.1
> PORTEPOCH=	1
> CATEGORIES=	security
> MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
>diff --git a/security/sshguard/distinfo b/security/sshguard/distinfo
>index 87c730da2d10..10cb3df07f08 100644
>--- a/security/sshguard/distinfo
>+++ b/security/sshguard/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562425350
>-SHA256 (sshguard-2.4.0.tar.gz) = 065ca4091b3a96802714b560dbbc3d9f0e67574e99e2b6e8857aa1027d17d6c0
>-SIZE (sshguard-2.4.0.tar.gz) = 771506
>+TIMESTAMP = 1562003151
>+SHA256 (sshguard-2.3.1.tar.gz) = 769055e26df78f4bca34c9a7acf265dfa224c055b33ced47f53d55bf659d20a2
>+SIZE (sshguard-2.3.1.tar.gz) = 765330
>diff --git a/security/sshguard/files/sshguard.in b/security/sshguard/files/sshguard.in
>index 424f88885eed..1233a855604f 100644
>--- a/security/sshguard/files/sshguard.in
>+++ b/security/sshguard/files/sshguard.in
>@@ -78,9 +78,8 @@ pidfile=${sshguard_pidfile:="/var/run/sshguard.pid"}
> 
> command=/usr/sbin/daemon
> actual_command="%%PREFIX%%/sbin/sshguard"
>-procname="/bin/sh"
>+procname="%%PREFIX%%/libexec/sshg-blocker"
> start_precmd=sshguard_prestart
>-stop_cmd=sshguard_stop
> command_args="-c ${actual_command} \${sshguard_flags} \${sshguard_blacklist_params} \${sshguard_watch_params} \${sshguard_danger_params} \${sshguard_release_params} \${sshguard_reset_params} \${sshguard_whitelist_params} -i ${pidfile}"
> 
> sshguard_prestart()
>@@ -116,11 +115,4 @@ sshguard_prestart()
> 	fi
> }
> 
>-sshguard_stop()
>-{
>-	sshg_blocker="%%PREFIX%%/libexec/sshg-blocker"
>-	rc_pid="$(check_process ${sshg_blocker})"
>-	kill $sig_stop "$rc_pid"
>-}
>-
> run_rc_command "$1"
>diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
>index ede834405a60..ddb89ae46792 100644
>--- a/security/vuxml/vuln.xml
>+++ b/security/vuxml/vuln.xml
>@@ -58,68 +58,6 @@ Notes:
>   * Do not forget port variants (linux-f10-libxml2, libxml2, etc.)
> -->
> <vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
>-  <vuln vid="3dd46e05-9fb0-11e9-bf65-00012e582166">
>-    <topic>webkit2-gtk3 -- Multiple vulnerabilities</topic>
>-    <affects>
>-      <package>
>-	<name>webkit2-gtk3</name>
>-	<range><lt>2.24.2</lt></range>
>-      </package>
>-    </affects>
>-    <description>
>-      <body xmlns="http://www.w3.org/1999/xhtml">
>-	<p>The WebKitGTK project reports many vulnerabilities,
>-	including several arbitrary code execution vulnerabilities.</p>
>-      </body>
>-    </description>
>-    <references>
>-      <url>https://webkitgtk.org/security/WSA-2019-0002.html</url>
>-      <cvename>CVE-2019-6201</cvename>
>-      <cvename>CVE-2019-6251</cvename>
>-      <cvename>CVE-2019-7285</cvename>
>-      <cvename>CVE-2019-7292</cvename>
>-      <cvename>CVE-2019-8503</cvename>
>-      <cvename>CVE-2019-8506</cvename>
>-      <cvename>CVE-2019-8515</cvename>
>-      <cvename>CVE-2019-8518</cvename>
>-      <cvename>CVE-2019-8523</cvename>
>-      <cvename>CVE-2019-8524</cvename>
>-      <cvename>CVE-2019-8535</cvename>
>-      <cvename>CVE-2019-8536</cvename>
>-      <cvename>CVE-2019-8544</cvename>
>-      <cvename>CVE-2019-8551</cvename>
>-      <cvename>CVE-2019-8558</cvename>
>-      <cvename>CVE-2019-8559</cvename>
>-      <cvename>CVE-2019-8563</cvename>
>-      <cvename>CVE-2019-11070</cvename>
>-      <url>https://webkitgtk.org/security/WSA-2019-0003.html</url>
>-      <cvename>CVE-2019-6237</cvename>
>-      <cvename>CVE-2019-8571</cvename>
>-      <cvename>CVE-2019-8583</cvename>
>-      <cvename>CVE-2019-8584</cvename>
>-      <cvename>CVE-2019-8586</cvename>
>-      <cvename>CVE-2019-8587</cvename>
>-      <cvename>CVE-2019-8594</cvename>
>-      <cvename>CVE-2019-8595</cvename>
>-      <cvename>CVE-2019-8596</cvename>
>-      <cvename>CVE-2019-8597</cvename>
>-      <cvename>CVE-2019-8601</cvename>
>-      <cvename>CVE-2019-8607</cvename>
>-      <cvename>CVE-2019-8608</cvename>
>-      <cvename>CVE-2019-8609</cvename>
>-      <cvename>CVE-2019-8610</cvename>
>-      <cvename>CVE-2019-8615</cvename>
>-      <cvename>CVE-2019-8611</cvename>
>-      <cvename>CVE-2019-8619</cvename>
>-      <cvename>CVE-2019-8622</cvename>
>-      <cvename>CVE-2019-8623</cvename>
>-    </references>
>-    <dates>
>-      <discovery>2019-04-10</discovery>
>-      <entry>2019-07-06</entry>
>-    </dates>
>-  </vuln>
>-
>   <vuln vid="3c5a4fe0-9ebb-11e9-9169-fcaa147e860e">
>     <topic>mediawiki -- multiple vulnerabilities</topic>
>     <affects>
>diff --git a/sysutils/Makefile b/sysutils/Makefile
>index 7e8911b31d8c..66c4fef710d7 100644
>--- a/sysutils/Makefile
>+++ b/sysutils/Makefile
>@@ -727,7 +727,6 @@
>     SUBDIR += ncdu
>     SUBDIR += ndmpd
>     SUBDIR += neofetch
>-    SUBDIR += netevent
>     SUBDIR += nfcutils
>     SUBDIR += nfsping
>     SUBDIR += nitrogen
>diff --git a/sysutils/burp-devel/Makefile b/sysutils/burp-devel/Makefile
>index 3e04bd5e7759..70d4b6ea55bf 100644
>--- a/sysutils/burp-devel/Makefile
>+++ b/sysutils/burp-devel/Makefile
>@@ -1,6 +1,6 @@
> # $FreeBSD$
> 
>-PORTVERSION=	2.3.10
>+PORTVERSION=	2.3.8
> PKGNAMESUFFIX=	-devel
> 
> COMMENT=	Network backup and restore program (development)
>diff --git a/sysutils/burp-devel/distinfo b/sysutils/burp-devel/distinfo
>index ad887b6db263..b98275b2a24a 100644
>--- a/sysutils/burp-devel/distinfo
>+++ b/sysutils/burp-devel/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562322907
>-SHA256 (grke-burp-2.3.10_GH0.tar.gz) = db436708e2ff6e1efbc527140c58e06cd5297017b9160683976e941a42327fb2
>-SIZE (grke-burp-2.3.10_GH0.tar.gz) = 620841
>+TIMESTAMP = 1559418707
>+SHA256 (grke-burp-2.3.8_GH0.tar.gz) = d4bd791c85fe68c846ebf2599db7cd944e7b32539f1b51dbdb44a07552dbebc6
>+SIZE (grke-burp-2.3.8_GH0.tar.gz) = 620385
>diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
>index 95ef3ad9de1d..906938c6ba6e 100644
>--- a/sysutils/ldap-account-manager/Makefile
>+++ b/sysutils/ldap-account-manager/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ldap-account-manager
>-DISTVERSION=	6.8
>+DISTVERSION=	6.7
> CATEGORIES=	sysutils www
> MASTER_SITES=	SF/${SHORTNAME}/LAM/${PORTVERSION}
> 
>@@ -17,7 +17,6 @@ RUN_DEPENDS=	p5-Quota>=0:sysutils/p5-Quota \
> USES=		perl5 php:web tar:bzip2
> USE_PHP=	curl gd gettext hash iconv json ldap openssl pcre session \
> 		simplexml xml xmlreader zip
>-
> NO_BUILD=	yes
> NO_ARCH=	yes
> 
>diff --git a/sysutils/ldap-account-manager/distinfo b/sysutils/ldap-account-manager/distinfo
>index 2800a6248507..1e3618b5a47c 100644
>--- a/sysutils/ldap-account-manager/distinfo
>+++ b/sysutils/ldap-account-manager/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562135616
>-SHA256 (ldap-account-manager-6.8.tar.bz2) = e04fd60b6624d402b4dd919e9bb0cf9248f3613f554495a08c010c5958aa066e
>-SIZE (ldap-account-manager-6.8.tar.bz2) = 19767865
>+TIMESTAMP = 1555524002
>+SHA256 (ldap-account-manager-6.7.tar.bz2) = 1bfccee672a9b3553c50adf2387ead83cd72116b81e1f707fbd22e97a99d167c
>+SIZE (ldap-account-manager-6.7.tar.bz2) = 19734035
>diff --git a/sysutils/netevent/Makefile b/sysutils/netevent/Makefile
>deleted file mode 100644
>index 7fc360cf159c..000000000000
>--- a/sysutils/netevent/Makefile
>+++ /dev/null
>@@ -1,39 +0,0 @@
>-# $FreeBSD$
>-
>-PORTNAME=	netevent
>-DISTVERSION=	0.2.1-79
>-DISTVERSIONSUFFIX=	-g37c47a4
>-CATEGORIES=	sysutils
>-
>-MAINTAINER=	greg@unrelenting.technology
>-COMMENT=	Tool for sharing uinput devices with other machines
>-
>-LICENSE=	GPLv2+
>-LICENSE_FILE=	${WRKSRC}/LICENSE
>-
>-BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
>-
>-USES=		compiler:c++14-lang gmake localbase
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	Blub
>-HAS_CONFIGURE=	yes
>-CPPFLAGS+=	-D_WITH_GETLINE # XXX Remove after FreeBSD 11 EOL
>-
>-OPTIONS_DEFINE=		EXAMPLES MANPAGES
>-OPTIONS_DEFAULT=	EXAMPLES MANPAGES
>-OPTIONS_SUB=		MANPAGES
>-
>-MANPAGES_BUILD_DEPENDS=	rst2man:textproc/py-docutils
>-MANPAGES_CONFIGURE_OFF=	--disable-doc
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
>-
>-do-install-MANPAGES-on:
>-	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
>-
>-do-install-EXAMPLES-on:
>-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/examples/simple.ne2 ${STAGEDIR}${EXAMPLESDIR}/
>-
>-.include <bsd.port.mk>
>diff --git a/sysutils/netevent/distinfo b/sysutils/netevent/distinfo
>deleted file mode 100644
>index db1a92a67985..000000000000
>--- a/sysutils/netevent/distinfo
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1562264080
>-SHA256 (Blub-netevent-0.2.1-79-g37c47a4_GH0.tar.gz) = 251c03781e289a940907990c1afb170cb8c80c1f36e7f8fc918662fa2fa25b18
>-SIZE (Blub-netevent-0.2.1-79-g37c47a4_GH0.tar.gz) = 38725
>diff --git a/sysutils/netevent/files/patch-Makefile b/sysutils/netevent/files/patch-Makefile
>deleted file mode 100644
>index 71bb566cd066..000000000000
>--- a/sysutils/netevent/files/patch-Makefile
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.orig	2018-12-07 15:42:58 UTC
>-+++ Makefile
>-@@ -8,7 +8,7 @@ MANDIR = $(DATAROOTDIR)/man
>- MAN1DIR = $(MANDIR)/man1
>- 
>- CPPFLAGS ?= -g
>--CPPFLAGS += -Wall -Werror -Wno-unknown-pragmas
>-+CPPFLAGS += -Wall -Wno-unknown-pragmas
>- CXX ?= clang++
>- # Code should compile with c++11 as well, but c++14 may have stricter
>- # attributes on some methods.
>diff --git a/sysutils/netevent/pkg-descr b/sysutils/netevent/pkg-descr
>deleted file mode 100644
>index cc30aaceada5..000000000000
>--- a/sysutils/netevent/pkg-descr
>+++ /dev/null
>@@ -1,5 +0,0 @@
>-Netevent is a tool which can be used to share linux event devices with other
>-machines (either via /dev/uinput or by implementing a client for the same
>-protocol with other means).
>-
>-WWW: https://github.com/Blub/netevent
>diff --git a/sysutils/netevent/pkg-plist b/sysutils/netevent/pkg-plist
>deleted file mode 100644
>index e635749221e4..000000000000
>--- a/sysutils/netevent/pkg-plist
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-bin/netevent
>-%%MANPAGES%%man/man1/netevent.1.gz
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.ne2
>diff --git a/sysutils/zbackup/Makefile b/sysutils/zbackup/Makefile
>index f37f69f4e13d..5cc5d07e50a5 100644
>--- a/sysutils/zbackup/Makefile
>+++ b/sysutils/zbackup/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	zbackup
> PORTVERSION=	1.4.4
>-PORTREVISION=	11
>+PORTREVISION=	10
> CATEGORIES=	sysutils
> 
> MAINTAINER=	ports@FreeBSD.org
>diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
>index de971ae9a7d9..d9ea87077be5 100644
>--- a/textproc/meld/Makefile
>+++ b/textproc/meld/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	meld
>-PORTVERSION=	3.20.1
>+PORTVERSION=	3.20.0
> CATEGORIES=	textproc devel python
> MASTER_SITES=	GNOME
> 
>diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
>index ec9991b7f0a9..8ff2748eb1dc 100644
>--- a/textproc/meld/distinfo
>+++ b/textproc/meld/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562394516
>-SHA256 (meld-3.20.1.tar.xz) = a54843bc4d6cb1d31d0a58aa725091622194d50c32ef67026b35c86dda3cb249
>-SIZE (meld-3.20.1.tar.xz) = 594812
>+TIMESTAMP = 1546786330
>+SHA256 (meld-3.20.0.tar.xz) = cb40fe2f749325d7a13c35ca4928664744ced248793cd5705a630af074887086
>+SIZE (meld-3.20.0.tar.xz) = 591956
>diff --git a/textproc/py-docx2txt/Makefile b/textproc/py-docx2txt/Makefile
>index 8744dcf136f2..85a968cc5f34 100644
>--- a/textproc/py-docx2txt/Makefile
>+++ b/textproc/py-docx2txt/Makefile
>@@ -1,7 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	docx2txt
>-DISTVERSION=	0.8
>+DISTVERSION=	0.7
>+PORTREVISION=	1
> CATEGORIES=	textproc python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git a/textproc/py-docx2txt/distinfo b/textproc/py-docx2txt/distinfo
>index d6a90f7d9b32..4b61f77bfb4e 100644
>--- a/textproc/py-docx2txt/distinfo
>+++ b/textproc/py-docx2txt/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562382221
>-SHA256 (docx2txt-0.8.tar.gz) = 2c06d98d7cfe2d3947e5760a57d924e3ff07745b379c8737723922e7009236e5
>-SIZE (docx2txt-0.8.tar.gz) = 2814
>+TIMESTAMP = 1529046338
>+SHA256 (docx2txt-0.7.tar.gz) = 335363e5eb827dde2838fae69f5032b9a5c00f311def4022c196424bce697f0f
>+SIZE (docx2txt-0.7.tar.gz) = 2781
>diff --git a/textproc/py-python-bidi/Makefile b/textproc/py-python-bidi/Makefile
>index ef4877a3c23d..df423c22f39b 100644
>--- a/textproc/py-python-bidi/Makefile
>+++ b/textproc/py-python-bidi/Makefile
>@@ -1,7 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	python-bidi
>-DISTVERSION=	0.4.1
>+DISTVERSION=	0.4.0
>+PORTREVISION=	1
> CATEGORIES=	textproc python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git a/textproc/py-python-bidi/distinfo b/textproc/py-python-bidi/distinfo
>index f90b684fb668..4afb28ef820e 100644
>--- a/textproc/py-python-bidi/distinfo
>+++ b/textproc/py-python-bidi/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562382327
>-SHA256 (python-bidi-0.4.1.tar.gz) = d55be25389827889ac3d6ca010bc386aeb3762080c219f768fa4dfa02c975aa8
>-SIZE (python-bidi-0.4.1.tar.gz) = 40327
>+TIMESTAMP = 1518519741
>+SHA256 (python-bidi-0.4.0.tar.gz) = 1a1b3dbee4a0b307c91a465ba4caa8baaaa178151acd20de50ba24f9385f7e13
>+SIZE (python-bidi-0.4.0.tar.gz) = 38566
>diff --git a/www/Makefile b/www/Makefile
>index 3e9563e7340d..56a72ecb22b7 100644
>--- a/www/Makefile
>+++ b/www/Makefile
>@@ -339,7 +339,6 @@
>     SUBDIR += mattermost-webapp
>     SUBDIR += mediawiki131
>     SUBDIR += mediawiki132
>-    SUBDIR += mediawiki133
>     SUBDIR += mergelog
>     SUBDIR += mgstat
>     SUBDIR += mhonarc
>@@ -2273,6 +2272,7 @@
>     SUBDIR += tomcat-native
>     SUBDIR += tomcat6
>     SUBDIR += tomcat7
>+    SUBDIR += tomcat8
>     SUBDIR += tomcat85
>     SUBDIR += tomcat9
>     SUBDIR += tomee
>diff --git a/www/madsonic/Makefile b/www/madsonic/Makefile
>index 9466bca051e4..74fdc549bead 100644
>--- a/www/madsonic/Makefile
>+++ b/www/madsonic/Makefile
>@@ -16,7 +16,8 @@ LICENSE=	GPLv3
> 
> OPTIONS_SINGLE=	APPSERVER
> APPSERVER_DESC=	Java Application Server
>-OPTIONS_SINGLE_APPSERVER=	JETTY TOMCAT7 TOMCAT6 RESIN3
>+OPTIONS_SINGLE_APPSERVER=	JETTY TOMCAT8 TOMCAT7 TOMCAT6 RESIN3
>+TOMCAT8_DESC=	Use Tomcat 8.x
> TOMCAT7_DESC=	Use Tomcat 7.x
> TOMCAT6_DESC=	Use Tomcat 6.x
> JETTY_DESC=	Use Jetty
>@@ -40,6 +41,8 @@ OPTIONS_SUB=	yes
> 
> RUN_DEPENDS+=	${JAVALIBDIR}/servlet-api.jar:www/servlet-api \
> 	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
>+TOMCAT8_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8
>+TOMCAT8_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8
> TOMCAT7_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7
> TOMCAT7_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7
> TOMCAT6_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat6
>@@ -78,6 +81,14 @@ SUB_FILES=	message-common\
> 	message-transcoding
> SUB_LIST=	MADSONIC_HOME="${MADSONIC_HOME}"
> 
>+.if ${PORT_OPTIONS:MTOMCAT8}
>+APPPKGMESSAGE=	pkg-message-tomcat
>+DISTVER=	tomcat
>+PKGNAMESUFFIX=	-tomcat8
>+SERVERDIR=	apache-tomcat-8.0
>+SUB_LIST+=	CONTAINERFLAGS="tomcat8_java_opts"
>+.endif
>+
> .if ${PORT_OPTIONS:MTOMCAT7}
> APPPKGMESSAGE=	pkg-message-tomcat
> DISTVER=	tomcat
>diff --git a/www/matomo/Makefile b/www/matomo/Makefile
>index bdc45555545d..4aec7575d4c7 100644
>--- a/www/matomo/Makefile
>+++ b/www/matomo/Makefile
>@@ -1,7 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	matomo
>-DISTVERSION=	3.10.0
>+DISTVERSION=	3.9.1
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://builds.matomo.org/
> PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
>diff --git a/www/matomo/distinfo b/www/matomo/distinfo
>index b3a8920d63cb..ebd23f5f2100 100644
>--- a/www/matomo/distinfo
>+++ b/www/matomo/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562236378
>-SHA256 (piwik-3.10.0.tar.gz) = d4749d6839b6939d981ef5b30217adfc0d22b99e7b06ec3e0ec0070788c86be3
>-SIZE (piwik-3.10.0.tar.gz) = 16802923
>+TIMESTAMP = 1554272935
>+SHA256 (piwik-3.9.1.tar.gz) = 6bc6f6429195908806cb53cb1475bf0e938316cf97ec3472f3388669385cb4f9
>+SIZE (piwik-3.9.1.tar.gz) = 16708650
>diff --git a/www/matomo/pkg-plist b/www/matomo/pkg-plist
>index 3c939b63e231..2e029c053751 100644
>--- a/www/matomo/pkg-plist
>+++ b/www/matomo/pkg-plist
>@@ -227,9 +227,7 @@
> %%WWWDIR%%/core/Filesystem.php
> %%WWWDIR%%/core/FrontController.php
> %%WWWDIR%%/core/Http.php
>-%%WWWDIR%%/core/Http/BadRequestException.php
> %%WWWDIR%%/core/Http/ControllerResolver.php
>-%%WWWDIR%%/core/Http/HttpCodeException.php
> %%WWWDIR%%/core/Http/Router.php
> %%WWWDIR%%/core/IP.php
> %%WWWDIR%%/core/Intl/Data/Provider/CurrencyDataProvider.php
>@@ -560,8 +558,6 @@
> %%WWWDIR%%/core/Updates/3.0.0-b3.php
> %%WWWDIR%%/core/Updates/3.0.0-b4.php
> %%WWWDIR%%/core/Updates/3.0.1-b1.php
>-%%WWWDIR%%/core/Updates/3.10.0-b2.php
>-%%WWWDIR%%/core/Updates/3.10.0-rc5.php
> %%WWWDIR%%/core/Updates/3.5.0-b2.php
> %%WWWDIR%%/core/Updates/3.5.0-b4.php
> %%WWWDIR%%/core/Updates/3.5.0-rc2.php
>@@ -1444,9 +1440,14 @@
> %%WWWDIR%%/misc/log-analytics/README.md
> %%WWWDIR%%/misc/log-analytics/import_logs.py
> %%WWWDIR%%/misc/others/ExamplePiwikTracker.php
>+%%WWWDIR%%/misc/others/api_rest_call.php
>+%%WWWDIR%%/misc/others/download-count.txt
> %%WWWDIR%%/misc/others/geoipUpdateRows.php
>+%%WWWDIR%%/misc/others/iframeWidget_localhost.php
>+%%WWWDIR%%/misc/others/stress.sh
> %%WWWDIR%%/misc/others/tracker_simpleImageTracker.php
> %%WWWDIR%%/misc/others/uninstall-delete-piwik-directory.php
>+%%WWWDIR%%/misc/others/widget_example_lastvisits.html
> %%WWWDIR%%/misc/proxy-hide-piwik-url/README.md
> %%WWWDIR%%/misc/user/index.html
> @(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/piwik.js
>@@ -1471,8 +1472,6 @@
> %%WWWDIR%%/plugins/API/RowEvolution.php
> %%WWWDIR%%/plugins/API/SegmentMetadata.php
> %%WWWDIR%%/plugins/API/WidgetMetadata.php
>-%%WWWDIR%%/plugins/API/config/config.php
>-%%WWWDIR%%/plugins/API/config/tracker.php
> %%WWWDIR%%/plugins/API/lang/am.json
> %%WWWDIR%%/plugins/API/lang/ar.json
> %%WWWDIR%%/plugins/API/lang/be.json
>@@ -1595,8 +1594,6 @@
> %%WWWDIR%%/plugins/Actions/Segment.php
> %%WWWDIR%%/plugins/Actions/Tracker/ActionsRequestProcessor.php
> %%WWWDIR%%/plugins/Actions/VisitorDetails.php
>-%%WWWDIR%%/plugins/Actions/config/config.php
>-%%WWWDIR%%/plugins/Actions/config/tracker.php
> %%WWWDIR%%/plugins/Actions/javascripts/actionsDataTable.js
> %%WWWDIR%%/plugins/Actions/javascripts/rowactions.js
> %%WWWDIR%%/plugins/Actions/lang/am.json
>@@ -1657,8 +1654,6 @@
> %%WWWDIR%%/plugins/Annotations/AnnotationList.php
> %%WWWDIR%%/plugins/Annotations/Annotations.php
> %%WWWDIR%%/plugins/Annotations/Controller.php
>-%%WWWDIR%%/plugins/Annotations/config/config.php
>-%%WWWDIR%%/plugins/Annotations/config/tracker.php
> %%WWWDIR%%/plugins/Annotations/javascripts/annotations.js
> %%WWWDIR%%/plugins/Annotations/lang/ar.json
> %%WWWDIR%%/plugins/Annotations/lang/bg.json
>@@ -1714,8 +1709,6 @@
> %%WWWDIR%%/plugins/BulkTracking/Tracker/Handler.php
> %%WWWDIR%%/plugins/BulkTracking/Tracker/Requests.php
> %%WWWDIR%%/plugins/BulkTracking/Tracker/Response.php
>-%%WWWDIR%%/plugins/BulkTracking/config/config.php
>-%%WWWDIR%%/plugins/BulkTracking/config/tracker.php
> %%WWWDIR%%/plugins/BulkTracking/plugin.json
> %%WWWDIR%%/plugins/Contents/API.php
> %%WWWDIR%%/plugins/Contents/Actions/ActionContent.php
>@@ -1735,8 +1728,6 @@
> %%WWWDIR%%/plugins/Contents/Reports/GetContentPieces.php
> %%WWWDIR%%/plugins/Contents/VisitorDetails.php
> %%WWWDIR%%/plugins/Contents/Widgets/ContentsByDimension.php
>-%%WWWDIR%%/plugins/Contents/config/config.php
>-%%WWWDIR%%/plugins/Contents/config/tracker.php
> %%WWWDIR%%/plugins/Contents/javascripts/contentsDataTable.js
> %%WWWDIR%%/plugins/Contents/lang/ar.json
> %%WWWDIR%%/plugins/Contents/lang/bg.json
>@@ -1807,9 +1798,7 @@
> %%WWWDIR%%/plugins/CoreAdminHome/angularjs/trackingfailures/trackingfailures.directive.html
> %%WWWDIR%%/plugins/CoreAdminHome/angularjs/trackingfailures/trackingfailures.directive.js
> %%WWWDIR%%/plugins/CoreAdminHome/angularjs/trackingfailures/trackingfailures.directive.less
>-%%WWWDIR%%/plugins/CoreAdminHome/config/config.php
> %%WWWDIR%%/plugins/CoreAdminHome/config/test.php
>-%%WWWDIR%%/plugins/CoreAdminHome/config/tracker.php
> %%WWWDIR%%/plugins/CoreAdminHome/javascripts/optOut.js
> %%WWWDIR%%/plugins/CoreAdminHome/javascripts/protocolCheck.js
> %%WWWDIR%%/plugins/CoreAdminHome/lang/ar.json
>@@ -1899,11 +1888,7 @@
> %%WWWDIR%%/plugins/CoreConsole/Commands/GitCommit.php
> %%WWWDIR%%/plugins/CoreConsole/Commands/GitPull.php
> %%WWWDIR%%/plugins/CoreConsole/Commands/GitPush.php
>-%%WWWDIR%%/plugins/CoreConsole/Commands/TestEmail.php
> %%WWWDIR%%/plugins/CoreConsole/Commands/WatchLog.php
>-%%WWWDIR%%/plugins/CoreConsole/CoreConsole.php
>-%%WWWDIR%%/plugins/CoreConsole/config/config.php
>-%%WWWDIR%%/plugins/CoreConsole/config/tracker.php
> %%WWWDIR%%/plugins/CoreHome/Categories/ActionsCategory.php
> %%WWWDIR%%/plugins/CoreHome/Categories/DevicesSubcategory.php
> %%WWWDIR%%/plugins/CoreHome/Categories/EngagementSubcategory.php
>@@ -1944,7 +1929,6 @@
> %%WWWDIR%%/plugins/CoreHome/Columns/VisitTotalTime.php
> %%WWWDIR%%/plugins/CoreHome/Columns/VisitorDaysSinceFirst.php
> %%WWWDIR%%/plugins/CoreHome/Columns/VisitorDaysSinceOrder.php
>-%%WWWDIR%%/plugins/CoreHome/Columns/VisitorFingerprint.php
> %%WWWDIR%%/plugins/CoreHome/Columns/VisitorId.php
> %%WWWDIR%%/plugins/CoreHome/Columns/VisitorReturning.php
> %%WWWDIR%%/plugins/CoreHome/Columns/VisitsCount.php
>@@ -2095,7 +2079,6 @@
> %%WWWDIR%%/plugins/CoreHome/angularjs/widget/widget.directive.html
> %%WWWDIR%%/plugins/CoreHome/angularjs/widget/widget.directive.js
> %%WWWDIR%%/plugins/CoreHome/config/config.php
>-%%WWWDIR%%/plugins/CoreHome/config/tracker.php
> %%WWWDIR%%/plugins/CoreHome/images/applePinnedTab.svg
> %%WWWDIR%%/plugins/CoreHome/images/applogo_128.png
> %%WWWDIR%%/plugins/CoreHome/images/applogo_144.png
>@@ -2114,7 +2097,7 @@
> %%WWWDIR%%/plugins/CoreHome/images/more_period.png
> %%WWWDIR%%/plugins/CoreHome/images/navigation_collapse.png
> %%WWWDIR%%/plugins/CoreHome/images/navigation_expand.png
>-%%WWWDIR%%/plugins/CoreHome/images/promo_video_splash.jpg
>+%%WWWDIR%%/plugins/CoreHome/images/promo_splash.png
> %%WWWDIR%%/plugins/CoreHome/images/reset_search.png
> %%WWWDIR%%/plugins/CoreHome/images/search.png
> %%WWWDIR%%/plugins/CoreHome/javascripts/broadcast.js
>@@ -2288,9 +2271,7 @@
> %%WWWDIR%%/plugins/CorePluginsAdmin/angularjs/plugins/plugin-upload.directive.js
> %%WWWDIR%%/plugins/CorePluginsAdmin/angularjs/save-button/save-button.directive.html
> %%WWWDIR%%/plugins/CorePluginsAdmin/angularjs/save-button/save-button.directive.js
>-%%WWWDIR%%/plugins/CorePluginsAdmin/config/config.php
> %%WWWDIR%%/plugins/CorePluginsAdmin/config/test.php
>-%%WWWDIR%%/plugins/CorePluginsAdmin/config/tracker.php
> %%WWWDIR%%/plugins/CorePluginsAdmin/images/flattr.png
> %%WWWDIR%%/plugins/CorePluginsAdmin/images/paypal_donate.png
> %%WWWDIR%%/plugins/CorePluginsAdmin/images/plugins.png
>@@ -2375,7 +2356,6 @@
> %%WWWDIR%%/plugins/CoreUpdater/Updater.php
> %%WWWDIR%%/plugins/CoreUpdater/UpdaterException.php
> %%WWWDIR%%/plugins/CoreUpdater/config/config.php
>-%%WWWDIR%%/plugins/CoreUpdater/config/tracker.php
> %%WWWDIR%%/plugins/CoreUpdater/javascripts/updateLayout.js
> %%WWWDIR%%/plugins/CoreUpdater/lang/am.json
> %%WWWDIR%%/plugins/CoreUpdater/lang/ar.json
>@@ -2466,8 +2446,6 @@
> %%WWWDIR%%/plugins/CoreVisualizations/angularjs/single-metric-view/single-metric-view.component.html
> %%WWWDIR%%/plugins/CoreVisualizations/angularjs/single-metric-view/single-metric-view.component.js
> %%WWWDIR%%/plugins/CoreVisualizations/angularjs/single-metric-view/single-metric-view.component.less
>-%%WWWDIR%%/plugins/CoreVisualizations/config/config.php
>-%%WWWDIR%%/plugins/CoreVisualizations/config/tracker.php
> %%WWWDIR%%/plugins/CoreVisualizations/javascripts/jqplot.js
> %%WWWDIR%%/plugins/CoreVisualizations/javascripts/jqplotBarGraph.js
> %%WWWDIR%%/plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
>@@ -2492,7 +2470,6 @@
> %%WWWDIR%%/plugins/CustomPiwikJs/TrackingCode/PiwikJsManipulator.php
> %%WWWDIR%%/plugins/CustomPiwikJs/TrackingCode/PluginTrackerFiles.php
> %%WWWDIR%%/plugins/CustomPiwikJs/config/config.php
>-%%WWWDIR%%/plugins/CustomPiwikJs/config/tracker.php
> %%WWWDIR%%/plugins/CustomPiwikJs/lang/cs.json
> %%WWWDIR%%/plugins/CustomPiwikJs/lang/da.json
> %%WWWDIR%%/plugins/CustomPiwikJs/lang/de.json
>@@ -2547,7 +2524,6 @@
> %%WWWDIR%%/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.model.js
> %%WWWDIR%%/plugins/CustomVariables/config/config.php
> %%WWWDIR%%/plugins/CustomVariables/config/test.php
>-%%WWWDIR%%/plugins/CustomVariables/config/tracker.php
> %%WWWDIR%%/plugins/CustomVariables/lang/ar.json
> %%WWWDIR%%/plugins/CustomVariables/lang/be.json
> %%WWWDIR%%/plugins/CustomVariables/lang/bg.json
>@@ -2610,9 +2586,7 @@
> %%WWWDIR%%/plugins/DBStats/Reports/GetReportDataSummaryByYear.php
> %%WWWDIR%%/plugins/DBStats/Reports/GetTrackerDataSummary.php
> %%WWWDIR%%/plugins/DBStats/Tasks.php
>-%%WWWDIR%%/plugins/DBStats/config/config.php
> %%WWWDIR%%/plugins/DBStats/config/test.php
>-%%WWWDIR%%/plugins/DBStats/config/tracker.php
> %%WWWDIR%%/plugins/DBStats/lang/am.json
> %%WWWDIR%%/plugins/DBStats/lang/ar.json
> %%WWWDIR%%/plugins/DBStats/lang/be.json
>@@ -2680,8 +2654,6 @@
> %%WWWDIR%%/plugins/Dashboard/Model.php
> %%WWWDIR%%/plugins/Dashboard/angularjs/common/services/dashboards-model.js
> %%WWWDIR%%/plugins/Dashboard/angularjs/dashboard/dashboard.directive.js
>-%%WWWDIR%%/plugins/Dashboard/config/config.php
>-%%WWWDIR%%/plugins/Dashboard/config/tracker.php
> %%WWWDIR%%/plugins/Dashboard/javascripts/dashboard.js
> %%WWWDIR%%/plugins/Dashboard/javascripts/dashboardObject.js
> %%WWWDIR%%/plugins/Dashboard/javascripts/dashboardWidget.js
>@@ -2768,8 +2740,6 @@
> %%WWWDIR%%/plugins/DevicePlugins/Reports/Base.php
> %%WWWDIR%%/plugins/DevicePlugins/Reports/GetPlugin.php
> %%WWWDIR%%/plugins/DevicePlugins/VisitorDetails.php
>-%%WWWDIR%%/plugins/DevicePlugins/config/config.php
>-%%WWWDIR%%/plugins/DevicePlugins/config/tracker.php
> %%WWWDIR%%/plugins/DevicePlugins/functions.php
> %%WWWDIR%%/plugins/DevicePlugins/lang/am.json
> %%WWWDIR%%/plugins/DevicePlugins/lang/ar.json
>@@ -2845,8 +2815,6 @@
> %%WWWDIR%%/plugins/DevicesDetection/Reports/GetType.php
> %%WWWDIR%%/plugins/DevicesDetection/Updates/1.14.php
> %%WWWDIR%%/plugins/DevicesDetection/VisitorDetails.php
>-%%WWWDIR%%/plugins/DevicesDetection/config/config.php
>-%%WWWDIR%%/plugins/DevicesDetection/config/tracker.php
> %%WWWDIR%%/plugins/DevicesDetection/functions.php
> %%WWWDIR%%/plugins/DevicesDetection/lang/am.json
> %%WWWDIR%%/plugins/DevicesDetection/lang/ar.json
>@@ -2938,7 +2906,6 @@
> %%WWWDIR%%/plugins/Diagnostics/Diagnostics.php
> %%WWWDIR%%/plugins/Diagnostics/Menu.php
> %%WWWDIR%%/plugins/Diagnostics/config/config.php
>-%%WWWDIR%%/plugins/Diagnostics/config/tracker.php
> %%WWWDIR%%/plugins/Diagnostics/lang/ar.json
> %%WWWDIR%%/plugins/Diagnostics/lang/cs.json
> %%WWWDIR%%/plugins/Diagnostics/lang/da.json
>@@ -3006,8 +2973,6 @@
> %%WWWDIR%%/plugins/Ecommerce/VisitorDetails.php
> %%WWWDIR%%/plugins/Ecommerce/Widgets/GetEcommerceLog.php
> %%WWWDIR%%/plugins/Ecommerce/Widgets/ProductsByDimension.php
>-%%WWWDIR%%/plugins/Ecommerce/config/config.php
>-%%WWWDIR%%/plugins/Ecommerce/config/tracker.php
> %%WWWDIR%%/plugins/Ecommerce/lang/bg.json
> %%WWWDIR%%/plugins/Ecommerce/lang/cs.json
> %%WWWDIR%%/plugins/Ecommerce/lang/da.json
>@@ -3023,7 +2988,6 @@
> %%WWWDIR%%/plugins/Ecommerce/lang/id.json
> %%WWWDIR%%/plugins/Ecommerce/lang/it.json
> %%WWWDIR%%/plugins/Ecommerce/lang/ja.json
>-%%WWWDIR%%/plugins/Ecommerce/lang/lt.json
> %%WWWDIR%%/plugins/Ecommerce/lang/nb.json
> %%WWWDIR%%/plugins/Ecommerce/lang/nl.json
> %%WWWDIR%%/plugins/Ecommerce/lang/pl.json
>@@ -3072,8 +3036,6 @@
> %%WWWDIR%%/plugins/Events/Reports/GetNameFromCategoryId.php
> %%WWWDIR%%/plugins/Events/VisitorDetails.php
> %%WWWDIR%%/plugins/Events/Widgets/EventsByDimension.php
>-%%WWWDIR%%/plugins/Events/config/config.php
>-%%WWWDIR%%/plugins/Events/config/tracker.php
> %%WWWDIR%%/plugins/Events/lang/ar.json
> %%WWWDIR%%/plugins/Events/lang/bg.json
> %%WWWDIR%%/plugins/Events/lang/ca.json
>@@ -3116,13 +3078,8 @@
> %%WWWDIR%%/plugins/Events/templates/_actionEvent.twig
> %%WWWDIR%%/plugins/ExampleAPI/API.php
> %%WWWDIR%%/plugins/ExampleAPI/ExampleAPI.php
>-%%WWWDIR%%/plugins/ExampleAPI/config/config.php
>-%%WWWDIR%%/plugins/ExampleAPI/config/tracker.php
> %%WWWDIR%%/plugins/ExampleAPI/plugin.json
> %%WWWDIR%%/plugins/ExampleCommand/Commands/HelloWorld.php
>-%%WWWDIR%%/plugins/ExampleCommand/ExampleCommand.php
>-%%WWWDIR%%/plugins/ExampleCommand/config/config.php
>-%%WWWDIR%%/plugins/ExampleCommand/config/tracker.php
> %%WWWDIR%%/plugins/ExampleCommand/plugin.json
> %%WWWDIR%%/plugins/ExampleLogTables/Columns/GroupAttributeAdmin.php
> %%WWWDIR%%/plugins/ExampleLogTables/Columns/UserAttributeGender.php
>@@ -3131,8 +3088,6 @@
> %%WWWDIR%%/plugins/ExampleLogTables/ExampleLogTables.php
> %%WWWDIR%%/plugins/ExampleLogTables/Tracker/LogTable/CustomGroupLog.php
> %%WWWDIR%%/plugins/ExampleLogTables/Tracker/LogTable/CustomUserLog.php
>-%%WWWDIR%%/plugins/ExampleLogTables/config/config.php
>-%%WWWDIR%%/plugins/ExampleLogTables/config/tracker.php
> %%WWWDIR%%/plugins/ExampleLogTables/plugin.json
> %%WWWDIR%%/plugins/ExamplePlugin/API.php
> %%WWWDIR%%/plugins/ExamplePlugin/Archiver.php
>@@ -3151,8 +3106,6 @@
> %%WWWDIR%%/plugins/ExamplePlugin/angularjs/example-component/example-component.component.html
> %%WWWDIR%%/plugins/ExamplePlugin/angularjs/example-component/example-component.component.js
> %%WWWDIR%%/plugins/ExamplePlugin/angularjs/example-component/example-component.component.less
>-%%WWWDIR%%/plugins/ExamplePlugin/config/config.php
>-%%WWWDIR%%/plugins/ExamplePlugin/config/tracker.php
> %%WWWDIR%%/plugins/ExamplePlugin/docs/faq.md
> %%WWWDIR%%/plugins/ExamplePlugin/docs/index.md
> %%WWWDIR%%/plugins/ExamplePlugin/javascripts/plugin.js
>@@ -3162,21 +3115,14 @@
> %%WWWDIR%%/plugins/ExampleReport/ExampleReport.php
> %%WWWDIR%%/plugins/ExampleReport/Reports/Base.php
> %%WWWDIR%%/plugins/ExampleReport/Reports/GetExampleReport.php
>-%%WWWDIR%%/plugins/ExampleReport/config/config.php
>-%%WWWDIR%%/plugins/ExampleReport/config/tracker.php
> %%WWWDIR%%/plugins/ExampleReport/plugin.json
>-%%WWWDIR%%/plugins/ExampleSettingsPlugin/ExampleSettingsPlugin.php
> %%WWWDIR%%/plugins/ExampleSettingsPlugin/MeasurableSettings.php
> %%WWWDIR%%/plugins/ExampleSettingsPlugin/SystemSettings.php
> %%WWWDIR%%/plugins/ExampleSettingsPlugin/UserSettings.php
>-%%WWWDIR%%/plugins/ExampleSettingsPlugin/config/config.php
>-%%WWWDIR%%/plugins/ExampleSettingsPlugin/config/tracker.php
> %%WWWDIR%%/plugins/ExampleSettingsPlugin/plugin.json
> %%WWWDIR%%/plugins/ExampleTheme/CHANGELOG.md
> %%WWWDIR%%/plugins/ExampleTheme/ExampleTheme.php
> %%WWWDIR%%/plugins/ExampleTheme/README.md
>-%%WWWDIR%%/plugins/ExampleTheme/config/config.php
>-%%WWWDIR%%/plugins/ExampleTheme/config/tracker.php
> %%WWWDIR%%/plugins/ExampleTheme/docs/faq.md
> %%WWWDIR%%/plugins/ExampleTheme/docs/index.md
> %%WWWDIR%%/plugins/ExampleTheme/plugin.json
>@@ -3186,22 +3132,17 @@
> %%WWWDIR%%/plugins/ExampleTracker/Columns/ExampleDimension.php
> %%WWWDIR%%/plugins/ExampleTracker/Columns/ExampleVisitDimension.php
> %%WWWDIR%%/plugins/ExampleTracker/ExampleTracker.php
>-%%WWWDIR%%/plugins/ExampleTracker/config/config.php
>-%%WWWDIR%%/plugins/ExampleTracker/config/tracker.php
> %%WWWDIR%%/plugins/ExampleTracker/lang/en.json
> %%WWWDIR%%/plugins/ExampleTracker/plugin.json
> %%WWWDIR%%/plugins/ExampleUI/API.php
> %%WWWDIR%%/plugins/ExampleUI/Categories/ExampleUiCategory.php
> %%WWWDIR%%/plugins/ExampleUI/Controller.php
>-%%WWWDIR%%/plugins/ExampleUI/ExampleUI.php
> %%WWWDIR%%/plugins/ExampleUI/Menu.php
> %%WWWDIR%%/plugins/ExampleUI/Reports/Base.php
> %%WWWDIR%%/plugins/ExampleUI/Reports/GetPlanetRatios.php
> %%WWWDIR%%/plugins/ExampleUI/Reports/GetPlanetRatiosWithLogos.php
> %%WWWDIR%%/plugins/ExampleUI/Reports/GetTemperatures.php
> %%WWWDIR%%/plugins/ExampleUI/Reports/GetTemperaturesEvolution.php
>-%%WWWDIR%%/plugins/ExampleUI/config/config.php
>-%%WWWDIR%%/plugins/ExampleUI/config/tracker.php
> %%WWWDIR%%/plugins/ExampleUI/images/icons-planet/LICENSE
> %%WWWDIR%%/plugins/ExampleUI/images/icons-planet/earth.png
> %%WWWDIR%%/plugins/ExampleUI/images/icons-planet/jupiter.png
>@@ -3219,8 +3160,6 @@
> %%WWWDIR%%/plugins/ExampleVisualization/ExampleVisualization.php
> %%WWWDIR%%/plugins/ExampleVisualization/README.md
> %%WWWDIR%%/plugins/ExampleVisualization/Visualizations/SimpleTable.php
>-%%WWWDIR%%/plugins/ExampleVisualization/config/config.php
>-%%WWWDIR%%/plugins/ExampleVisualization/config/tracker.php
> %%WWWDIR%%/plugins/ExampleVisualization/images/table.png
> %%WWWDIR%%/plugins/ExampleVisualization/plugin.json
> %%WWWDIR%%/plugins/ExampleVisualization/templates/simpleTable.twig
>@@ -3228,11 +3167,6 @@
> %%WWWDIR%%/plugins/Feedback/Controller.php
> %%WWWDIR%%/plugins/Feedback/Feedback.php
> %%WWWDIR%%/plugins/Feedback/Menu.php
>-%%WWWDIR%%/plugins/Feedback/angularjs/feedback-popup/feedback-popup.controller.js
>-%%WWWDIR%%/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.html
>-%%WWWDIR%%/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.js
>-%%WWWDIR%%/plugins/Feedback/angularjs/feedback-popup/feedback-popup.directive.less
>-%%WWWDIR%%/plugins/Feedback/angularjs/feedback-popup/review-links.directive.html
> %%WWWDIR%%/plugins/Feedback/angularjs/ratefeature/icon_license
> %%WWWDIR%%/plugins/Feedback/angularjs/ratefeature/ratefeature-model.service.js
> %%WWWDIR%%/plugins/Feedback/angularjs/ratefeature/ratefeature.controller.js
>@@ -3241,14 +3175,11 @@
> %%WWWDIR%%/plugins/Feedback/angularjs/ratefeature/ratefeature.directive.less
> %%WWWDIR%%/plugins/Feedback/angularjs/ratefeature/thumbs-down.png
> %%WWWDIR%%/plugins/Feedback/angularjs/ratefeature/thumbs-up.png
>-%%WWWDIR%%/plugins/Feedback/config/config.php
>-%%WWWDIR%%/plugins/Feedback/config/tracker.php
>-%%WWWDIR%%/plugins/Feedback/images/capterra.svg
>-%%WWWDIR%%/plugins/Feedback/images/g2crowd.svg
>-%%WWWDIR%%/plugins/Feedback/images/newsletter.svg
>-%%WWWDIR%%/plugins/Feedback/images/producthunt.svg
>-%%WWWDIR%%/plugins/Feedback/images/saasworthy.png
>-%%WWWDIR%%/plugins/Feedback/images/trustradius.svg
>+%%WWWDIR%%/plugins/Feedback/images/facebook.png
>+%%WWWDIR%%/plugins/Feedback/images/github.png
>+%%WWWDIR%%/plugins/Feedback/images/linkedin.png
>+%%WWWDIR%%/plugins/Feedback/images/newsletter.png
>+%%WWWDIR%%/plugins/Feedback/images/twitter.png
> %%WWWDIR%%/plugins/Feedback/lang/ar.json
> %%WWWDIR%%/plugins/Feedback/lang/be.json
> %%WWWDIR%%/plugins/Feedback/lang/bg.json
>@@ -3297,7 +3228,6 @@
> %%WWWDIR%%/plugins/Feedback/lang/zh-cn.json
> %%WWWDIR%%/plugins/Feedback/lang/zh-tw.json
> %%WWWDIR%%/plugins/Feedback/stylesheets/feedback.less
>-%%WWWDIR%%/plugins/Feedback/templates/feedbackPopup.twig
> %%WWWDIR%%/plugins/Feedback/templates/index.twig
> %%WWWDIR%%/plugins/GeoIp2/Columns/Region.php
> %%WWWDIR%%/plugins/GeoIp2/Commands/ConvertRegionCodesToIso.php
>@@ -3310,18 +3240,15 @@
> %%WWWDIR%%/plugins/GeoIp2/Tasks.php
> %%WWWDIR%%/plugins/GeoIp2/config/config.php
> %%WWWDIR%%/plugins/GeoIp2/config/test.php
>-%%WWWDIR%%/plugins/GeoIp2/config/tracker.php
> %%WWWDIR%%/plugins/GeoIp2/data/isoRegionNames.php
> %%WWWDIR%%/plugins/GeoIp2/data/regionMapping.php
> %%WWWDIR%%/plugins/GeoIp2/lang/de.json
> %%WWWDIR%%/plugins/GeoIp2/lang/el.json
> %%WWWDIR%%/plugins/GeoIp2/lang/en.json
> %%WWWDIR%%/plugins/GeoIp2/lang/es.json
>-%%WWWDIR%%/plugins/GeoIp2/lang/fi.json
> %%WWWDIR%%/plugins/GeoIp2/lang/fr.json
> %%WWWDIR%%/plugins/GeoIp2/lang/it.json
> %%WWWDIR%%/plugins/GeoIp2/lang/ja.json
>-%%WWWDIR%%/plugins/GeoIp2/lang/nl.json
> %%WWWDIR%%/plugins/GeoIp2/lang/pl.json
> %%WWWDIR%%/plugins/GeoIp2/lang/pt.json
> %%WWWDIR%%/plugins/GeoIp2/lang/ru.json
>@@ -3376,8 +3303,6 @@
> %%WWWDIR%%/plugins/Goals/angularjs/common/directives/goal-page-link.js
> %%WWWDIR%%/plugins/Goals/angularjs/manage-goals/manage-goals.controller.js
> %%WWWDIR%%/plugins/Goals/angularjs/manage-goals/manage-goals.directive.js
>-%%WWWDIR%%/plugins/Goals/config/config.php
>-%%WWWDIR%%/plugins/Goals/config/tracker.php
> %%WWWDIR%%/plugins/Goals/lang/am.json
> %%WWWDIR%%/plugins/Goals/lang/ar.json
> %%WWWDIR%%/plugins/Goals/lang/be.json
>@@ -3440,8 +3365,6 @@
> %%WWWDIR%%/plugins/Goals/templates/manageGoals.twig
> %%WWWDIR%%/plugins/Heartbeat/Heartbeat.php
> %%WWWDIR%%/plugins/Heartbeat/Tracker/PingRequestProcessor.php
>-%%WWWDIR%%/plugins/Heartbeat/config/config.php
>-%%WWWDIR%%/plugins/Heartbeat/config/tracker.php
> %%WWWDIR%%/plugins/Heartbeat/plugin.json
> %%WWWDIR%%/plugins/ImageGraph/API.php
> %%WWWDIR%%/plugins/ImageGraph/Controller.php
>@@ -3455,8 +3378,6 @@
> %%WWWDIR%%/plugins/ImageGraph/StaticGraph/Pie3D.php
> %%WWWDIR%%/plugins/ImageGraph/StaticGraph/PieGraph.php
> %%WWWDIR%%/plugins/ImageGraph/StaticGraph/VerticalBar.php
>-%%WWWDIR%%/plugins/ImageGraph/config/config.php
>-%%WWWDIR%%/plugins/ImageGraph/config/tracker.php
> %%WWWDIR%%/plugins/ImageGraph/fonts/tahoma.ttf
> %%WWWDIR%%/plugins/ImageGraph/lang/ar.json
> %%WWWDIR%%/plugins/ImageGraph/lang/bg.json
>@@ -3510,8 +3431,6 @@
> %%WWWDIR%%/plugins/Insights/Visualizations/Insight/RequestConfig.php
> %%WWWDIR%%/plugins/Insights/Widgets/GetInsightsOverview.php
> %%WWWDIR%%/plugins/Insights/Widgets/GetOverallMoversAndShakers.php
>-%%WWWDIR%%/plugins/Insights/config/config.php
>-%%WWWDIR%%/plugins/Insights/config/tracker.php
> %%WWWDIR%%/plugins/Insights/images/idea.png
> %%WWWDIR%%/plugins/Insights/javascripts/insightsDataTable.js
> %%WWWDIR%%/plugins/Insights/lang/bg.json
>@@ -3568,8 +3487,6 @@
> %%WWWDIR%%/plugins/Installation/ServerFilesGenerator.php
> %%WWWDIR%%/plugins/Installation/View.php
> %%WWWDIR%%/plugins/Installation/Widgets/GetSystemCheck.php
>-%%WWWDIR%%/plugins/Installation/config/config.php
>-%%WWWDIR%%/plugins/Installation/config/tracker.php
> %%WWWDIR%%/plugins/Installation/javascripts/installation.js
> %%WWWDIR%%/plugins/Installation/lang/am.json
> %%WWWDIR%%/plugins/Installation/lang/ar.json
>@@ -3648,7 +3565,6 @@
> %%WWWDIR%%/plugins/Intl/DateTimeFormatProvider.php
> %%WWWDIR%%/plugins/Intl/Intl.php
> %%WWWDIR%%/plugins/Intl/config/config.php
>-%%WWWDIR%%/plugins/Intl/config/tracker.php
> %%WWWDIR%%/plugins/Intl/lang/am.json
> %%WWWDIR%%/plugins/Intl/lang/ar.json
> %%WWWDIR%%/plugins/Intl/lang/be.json
>@@ -3710,13 +3626,10 @@
> %%WWWDIR%%/plugins/IntranetMeasurable/MeasurableSettings.php
> %%WWWDIR%%/plugins/IntranetMeasurable/Tracker/RequestProcessor.php
> %%WWWDIR%%/plugins/IntranetMeasurable/Type.php
>-%%WWWDIR%%/plugins/IntranetMeasurable/config/config.php
>-%%WWWDIR%%/plugins/IntranetMeasurable/config/tracker.php
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/de.json
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/el.json
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/en.json
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/es.json
>-%%WWWDIR%%/plugins/IntranetMeasurable/lang/fi.json
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/fr.json
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/it.json
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/ja.json
>@@ -3724,7 +3637,6 @@
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/pt.json
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/ru.json
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/sq.json
>-%%WWWDIR%%/plugins/IntranetMeasurable/lang/sv.json
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/tr.json
> %%WWWDIR%%/plugins/IntranetMeasurable/lang/zh-tw.json
> %%WWWDIR%%/plugins/IntranetMeasurable/plugin.json
>@@ -3756,8 +3668,6 @@
> %%WWWDIR%%/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.controller.js
> %%WWWDIR%%/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html
> %%WWWDIR%%/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.js
>-%%WWWDIR%%/plugins/LanguagesManager/config/config.php
>-%%WWWDIR%%/plugins/LanguagesManager/config/tracker.php
> %%WWWDIR%%/plugins/LanguagesManager/lang/ar.json
> %%WWWDIR%%/plugins/LanguagesManager/lang/be.json
> %%WWWDIR%%/plugins/LanguagesManager/lang/bg.json
>@@ -3832,9 +3742,6 @@
> %%WWWDIR%%/plugins/Live/Visualizations/VisitorLog/Config.php
> %%WWWDIR%%/plugins/Live/Widgets/GetVisitorProfilePopup.php
> %%WWWDIR%%/plugins/Live/Widgets/Widget.php
>-%%WWWDIR%%/plugins/Live/angularjs/live-widget-refresh/live-widget-refresh.directive.js
>-%%WWWDIR%%/plugins/Live/config/config.php
>-%%WWWDIR%%/plugins/Live/config/tracker.php
> %%WWWDIR%%/plugins/Live/images/file0.png
> %%WWWDIR%%/plugins/Live/images/file1.png
> %%WWWDIR%%/plugins/Live/images/file2.png
>@@ -3941,7 +3848,6 @@
> %%WWWDIR%%/plugins/Login/Tasks.php
> %%WWWDIR%%/plugins/Login/config/config.php
> %%WWWDIR%%/plugins/Login/config/test.php
>-%%WWWDIR%%/plugins/Login/config/tracker.php
> %%WWWDIR%%/plugins/Login/javascripts/bruteforcelog.js
> %%WWWDIR%%/plugins/Login/javascripts/login.js
> %%WWWDIR%%/plugins/Login/lang/am.json
>@@ -4031,7 +3937,6 @@
> %%WWWDIR%%/plugins/Marketplace/angularjs/plugins/plugin-name.directive.js
> %%WWWDIR%%/plugins/Marketplace/config/config.php
> %%WWWDIR%%/plugins/Marketplace/config/test.php
>-%%WWWDIR%%/plugins/Marketplace/config/tracker.php
> %%WWWDIR%%/plugins/Marketplace/images/rating_important.png
> %%WWWDIR%%/plugins/Marketplace/lang/am.json
> %%WWWDIR%%/plugins/Marketplace/lang/ar.json
>@@ -4106,8 +4011,6 @@
> %%WWWDIR%%/plugins/MobileAppMeasurable/MeasurableSettings.php
> %%WWWDIR%%/plugins/MobileAppMeasurable/MobileAppMeasurable.php
> %%WWWDIR%%/plugins/MobileAppMeasurable/Type.php
>-%%WWWDIR%%/plugins/MobileAppMeasurable/config/config.php
>-%%WWWDIR%%/plugins/MobileAppMeasurable/config/tracker.php
> %%WWWDIR%%/plugins/MobileAppMeasurable/lang/cs.json
> %%WWWDIR%%/plugins/MobileAppMeasurable/lang/da.json
> %%WWWDIR%%/plugins/MobileAppMeasurable/lang/de.json
>@@ -4156,8 +4059,6 @@
> %%WWWDIR%%/plugins/MobileMessaging/angularjs/manage-mobile-phone-numbers.controller.js
> %%WWWDIR%%/plugins/MobileMessaging/angularjs/manage-sms-provider.controller.js
> %%WWWDIR%%/plugins/MobileMessaging/angularjs/sms-provider-credentials.directive.js
>-%%WWWDIR%%/plugins/MobileMessaging/config/config.php
>-%%WWWDIR%%/plugins/MobileMessaging/config/tracker.php
> %%WWWDIR%%/plugins/MobileMessaging/images/ASPSMS.png
> %%WWWDIR%%/plugins/MobileMessaging/images/Clockwork.png
> %%WWWDIR%%/plugins/MobileMessaging/images/phone.png
>@@ -4202,6 +4103,7 @@
> %%WWWDIR%%/plugins/MobileMessaging/stylesheets/MobileMessagingSettings.less
> %%WWWDIR%%/plugins/MobileMessaging/templates/SMSReport.twig
> %%WWWDIR%%/plugins/MobileMessaging/templates/credentials.twig
>+%%WWWDIR%%/plugins/Monolog/Handler/LogCaptureHandler.php
> %%WWWDIR%%/plugins/MobileMessaging/templates/index.twig
> %%WWWDIR%%/plugins/MobileMessaging/templates/macros.twig
> %%WWWDIR%%/plugins/MobileMessaging/templates/reportParametersScheduledReports.twig
>@@ -4210,7 +4112,6 @@
> %%WWWDIR%%/plugins/Monolog/Handler/EchoHandler.php
> %%WWWDIR%%/plugins/Monolog/Handler/FailureLogMessageDetector.php
> %%WWWDIR%%/plugins/Monolog/Handler/FileHandler.php
>-%%WWWDIR%%/plugins/Monolog/Handler/LogCaptureHandler.php
> %%WWWDIR%%/plugins/Monolog/Handler/WebNotificationHandler.php
> %%WWWDIR%%/plugins/Monolog/Monolog.php
> %%WWWDIR%%/plugins/Monolog/Processor/ClassNameProcessor.php
>@@ -4224,9 +4125,6 @@
> %%WWWDIR%%/plugins/Monolog/plugin.json
> %%WWWDIR%%/plugins/Morpheus/Controller.php
> %%WWWDIR%%/plugins/Morpheus/Menu.php
>-%%WWWDIR%%/plugins/Morpheus/Morpheus.php
>-%%WWWDIR%%/plugins/Morpheus/config/config.php
>-%%WWWDIR%%/plugins/Morpheus/config/tracker.php
> %%WWWDIR%%/plugins/Morpheus/fonts/README.md
> %%WWWDIR%%/plugins/Morpheus/fonts/matomo.svg
> %%WWWDIR%%/plugins/Morpheus/fonts/matomo.ttf
>@@ -4968,116 +4866,6 @@
> %%WWWDIR%%/plugins/Morpheus/icons/dist/plugins/realplayer.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/plugins/silverlight.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/plugins/windowsmedia.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.118700.se.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.123people.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.1881.no.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.abacho.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.acoon.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.allaverksamheter.se.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.allesklar.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.alltheweb.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.altavista.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.arcor.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.baidu.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.blogdigger.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.blogpulse.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.charter.net.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.crawler.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.cuil.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.dasoertliche.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.eniro.se.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.eurip.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.euroseek.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.everyclick.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.exalead.fr.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.facebook.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.fastbrowsersearch.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.findhurtig.dk.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.fireball.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.firstsfind.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.fixsuche.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.flix.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.gigablast.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.gnadenmeer.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.gomeo.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.google.interia.pl.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.goyellow.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.gulesider.no.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.haosou.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.highbeam.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.hooseek.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.hotbot.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.icq.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.ilse.nl.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.isodelen.se.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.jungle-spider.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.kataweb.it.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.kensaq.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.latne.lv.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.lookany.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.looksmart.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.maailm.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.mamma.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.meinestadt.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.mister-wong.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.monstercrawler.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.mozbot.fr.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.mysearch.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.najdi.si.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.neti.ee.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.only-search.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.paperball.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.picsearch.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.plazoo.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.qualigo.at.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.qwant.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.riksdelen.se.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.search.ch.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.search.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.searchcanvas.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.searchy.co.uk.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.sharelook.fr.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.skynet.be.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.sm.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.so-net.ne.jp.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.sogou.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.soso.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.sputnik.ru.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.startsiden.no.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.suchmaschine.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.suchnase.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.talimba.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.talktalk.co.uk.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.teoma.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.tixuma.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.toile.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.toolbarhome.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.toppreise.ch.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.trouvez.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.trovarapido.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.trusted-search.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.twingly.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.url.org.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.vinden.nl.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.vindex.nl.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.walhello.info.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.web.nl.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.weborama.fr.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.websearch.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.witch.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.woopie.jp.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.x-recherche.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.yasni.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.yatedo.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.yougoo.fr.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.zapmeta.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.zoeken.nl.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.zoznam.sk.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.zxuso.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%1.dastelefonbuch.de.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%2.austronaut.at.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%2.inbox.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%3.zoek.nl.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/1.cz.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/abcsok.no.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/alexa.com.png
>@@ -5156,7 +4944,6 @@
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/s1.metacrawler.de.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/scholar.google.com.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/scour.com.png
>-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/search.%%WWWOWN%%.ee.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/search.aol.com.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/search.auone.jp.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/search.avira.com.png
>@@ -5193,6 +4980,7 @@
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/search.softonic.com.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/search.tiscali.it.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/search.winamp.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/search.%%WWWOWN%%.ee.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/search.yahoo.co.jp.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/search.yam.com.png
>@@ -5227,6 +5015,116 @@
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/web.volny.cz.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/websearch.cs.com.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/websearch.rakuten.co.jp.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.118700.se.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.123people.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.1881.no.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.abacho.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.acoon.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.allaverksamheter.se.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.allesklar.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.alltheweb.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.altavista.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.arcor.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.baidu.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.blogdigger.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.blogpulse.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.charter.net.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.crawler.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.cuil.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.dasoertliche.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.eniro.se.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.eurip.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.euroseek.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.everyclick.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.exalead.fr.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.facebook.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.fastbrowsersearch.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.findhurtig.dk.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.fireball.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.firstsfind.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.fixsuche.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.flix.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.gigablast.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.gnadenmeer.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.gomeo.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.google.interia.pl.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.goyellow.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.gulesider.no.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.haosou.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.highbeam.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.hooseek.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.hotbot.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.icq.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.ilse.nl.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.isodelen.se.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.jungle-spider.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.kataweb.it.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.kensaq.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.latne.lv.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.lookany.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.looksmart.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.maailm.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.mamma.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.meinestadt.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.mister-wong.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.monstercrawler.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.mozbot.fr.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.mysearch.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.najdi.si.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.neti.ee.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.only-search.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.paperball.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.picsearch.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.plazoo.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.qualigo.at.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.qwant.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.riksdelen.se.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.search.ch.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.search.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.searchcanvas.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.searchy.co.uk.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.sharelook.fr.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.skynet.be.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.sm.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.so-net.ne.jp.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.sogou.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.soso.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.sputnik.ru.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.startsiden.no.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.suchmaschine.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.suchnase.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.talimba.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.talktalk.co.uk.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.teoma.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.tixuma.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.toile.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.toolbarhome.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.toppreise.ch.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.trouvez.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.trovarapido.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.trusted-search.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.twingly.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.url.org.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.vinden.nl.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.vindex.nl.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.walhello.info.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.web.nl.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.weborama.fr.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.websearch.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.witch.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.woopie.jp.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.x-recherche.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.yasni.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.yatedo.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.yougoo.fr.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.zapmeta.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.zoeken.nl.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.zoznam.sk.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%.zxuso.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%1.dastelefonbuch.de.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%2.austronaut.at.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%2.inbox.com.png
>+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/%%WWWOWN%%3.zoek.nl.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/xx.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/yandex.ru.png
> %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/yellowmap.de.png
>@@ -5490,8 +5388,6 @@
> %%WWWDIR%%/plugins/MultiSites/angularjs/site/site.controller.js
> %%WWWDIR%%/plugins/MultiSites/angularjs/site/site.directive.html
> %%WWWDIR%%/plugins/MultiSites/angularjs/site/site.directive.js
>-%%WWWDIR%%/plugins/MultiSites/config/config.php
>-%%WWWDIR%%/plugins/MultiSites/config/tracker.php
> %%WWWDIR%%/plugins/MultiSites/images/arrow_asc.png
> %%WWWDIR%%/plugins/MultiSites/images/arrow_desc.png
> %%WWWDIR%%/plugins/MultiSites/images/arrow_down.png
>@@ -5560,8 +5456,6 @@
> %%WWWDIR%%/plugins/Overlay/client/loading.gif
> %%WWWDIR%%/plugins/Overlay/client/translations.js
> %%WWWDIR%%/plugins/Overlay/client/urlnormalizer.js
>-%%WWWDIR%%/plugins/Overlay/config/config.php
>-%%WWWDIR%%/plugins/Overlay/config/tracker.php
> %%WWWDIR%%/plugins/Overlay/config/ui-test.php
> %%WWWDIR%%/plugins/Overlay/images/overlay_icon.png
> %%WWWDIR%%/plugins/Overlay/images/overlay_icon_hover.png
>@@ -5660,8 +5554,6 @@
> %%WWWDIR%%/plugins/PrivacyManager/angularjs/opt-out-customizer/opt-out-customizer.directive.less
> %%WWWDIR%%/plugins/PrivacyManager/angularjs/report-deletion.model.js
> %%WWWDIR%%/plugins/PrivacyManager/angularjs/schedule-report-deletion/schedule-report-deletion.controller.js
>-%%WWWDIR%%/plugins/PrivacyManager/config/config.php
>-%%WWWDIR%%/plugins/PrivacyManager/config/tracker.php
> %%WWWDIR%%/plugins/PrivacyManager/lang/ar.json
> %%WWWDIR%%/plugins/PrivacyManager/lang/be.json
> %%WWWDIR%%/plugins/PrivacyManager/lang/bg.json
>@@ -5723,9 +5615,7 @@
> %%WWWDIR%%/plugins/ProfessionalServices/Promo.php
> %%WWWDIR%%/plugins/ProfessionalServices/Widgets/PromoServices.php
> %%WWWDIR%%/plugins/ProfessionalServices/Widgets/Rss.php
>-%%WWWDIR%%/plugins/ProfessionalServices/config/config.php
> %%WWWDIR%%/plugins/ProfessionalServices/config/test.php
>-%%WWWDIR%%/plugins/ProfessionalServices/config/tracker.php
> %%WWWDIR%%/plugins/ProfessionalServices/images/promo.png
> %%WWWDIR%%/plugins/ProfessionalServices/lang/en.json
> %%WWWDIR%%/plugins/ProfessionalServices/plugin.json
>@@ -5748,8 +5638,6 @@
> %%WWWDIR%%/plugins/Provider/Reports/GetProvider.php
> %%WWWDIR%%/plugins/Provider/Updates/3.0.0-b1.php
> %%WWWDIR%%/plugins/Provider/VisitorDetails.php
>-%%WWWDIR%%/plugins/Provider/config/config.php
>-%%WWWDIR%%/plugins/Provider/config/tracker.php
> %%WWWDIR%%/plugins/Provider/functions.php
> %%WWWDIR%%/plugins/Provider/lang/am.json
> %%WWWDIR%%/plugins/Provider/lang/ar.json
>@@ -5802,8 +5690,6 @@
> %%WWWDIR%%/plugins/Provider/templates/_visitorDetails.twig
> %%WWWDIR%%/plugins/Proxy/Controller.php
> %%WWWDIR%%/plugins/Proxy/Proxy.php
>-%%WWWDIR%%/plugins/Proxy/config/config.php
>-%%WWWDIR%%/plugins/Proxy/config/tracker.php
> %%WWWDIR%%/plugins/Proxy/plugin.json
> %%WWWDIR%%/plugins/Referrers/API.php
> %%WWWDIR%%/plugins/Referrers/Archiver.php
>@@ -5827,7 +5713,6 @@
> %%WWWDIR%%/plugins/Referrers/Columns/Website.php
> %%WWWDIR%%/plugins/Referrers/Columns/WebsitePage.php
> %%WWWDIR%%/plugins/Referrers/Controller.php
>-%%WWWDIR%%/plugins/Referrers/DataTable/Filter/GroupDifferentSocialWritings.php
> %%WWWDIR%%/plugins/Referrers/DataTable/Filter/KeywordNotDefined.php
> %%WWWDIR%%/plugins/Referrers/DataTable/Filter/KeywordsFromSearchEngineId.php
> %%WWWDIR%%/plugins/Referrers/DataTable/Filter/SearchEnginesFromKeywordId.php
>@@ -5857,8 +5742,6 @@
> %%WWWDIR%%/plugins/Referrers/angularjs/campaign-builder/campaign-builder.directive.html
> %%WWWDIR%%/plugins/Referrers/angularjs/campaign-builder/campaign-builder.directive.js
> %%WWWDIR%%/plugins/Referrers/angularjs/campaign-builder/campaign-builder.directive.less
>-%%WWWDIR%%/plugins/Referrers/config/config.php
>-%%WWWDIR%%/plugins/Referrers/config/tracker.php
> %%WWWDIR%%/plugins/Referrers/functions.php
> %%WWWDIR%%/plugins/Referrers/lang/am.json
> %%WWWDIR%%/plugins/Referrers/lang/ar.json
>@@ -5927,8 +5810,6 @@
> %%WWWDIR%%/plugins/Resolution/Reports/GetResolution.php
> %%WWWDIR%%/plugins/Resolution/Resolution.php
> %%WWWDIR%%/plugins/Resolution/VisitorDetails.php
>-%%WWWDIR%%/plugins/Resolution/config/config.php
>-%%WWWDIR%%/plugins/Resolution/config/tracker.php
> %%WWWDIR%%/plugins/Resolution/functions.php
> %%WWWDIR%%/plugins/Resolution/lang/am.json
> %%WWWDIR%%/plugins/Resolution/lang/ar.json
>@@ -5985,8 +5866,6 @@
> %%WWWDIR%%/plugins/RssWidget/RssWidget.php
> %%WWWDIR%%/plugins/RssWidget/Widgets/RssChangelog.php
> %%WWWDIR%%/plugins/RssWidget/Widgets/RssPiwik.php
>-%%WWWDIR%%/plugins/RssWidget/config/config.php
>-%%WWWDIR%%/plugins/RssWidget/config/tracker.php
> %%WWWDIR%%/plugins/RssWidget/plugin.json
> %%WWWDIR%%/plugins/RssWidget/stylesheets/rss.less
> %%WWWDIR%%/plugins/SEO/API.php
>@@ -6000,8 +5879,6 @@
> %%WWWDIR%%/plugins/SEO/Metric/ProviderCache.php
> %%WWWDIR%%/plugins/SEO/SEO.php
> %%WWWDIR%%/plugins/SEO/Widgets/GetRank.php
>-%%WWWDIR%%/plugins/SEO/config/config.php
>-%%WWWDIR%%/plugins/SEO/config/tracker.php
> %%WWWDIR%%/plugins/SEO/javascripts/rank.js
> %%WWWDIR%%/plugins/SEO/lang/ar.json
> %%WWWDIR%%/plugins/SEO/lang/be.json
>@@ -6064,7 +5941,6 @@
> %%WWWDIR%%/plugins/ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.directive.js
> %%WWWDIR%%/plugins/ScheduledReports/config/config.php
> %%WWWDIR%%/plugins/ScheduledReports/config/tcpdf_config.php
>-%%WWWDIR%%/plugins/ScheduledReports/config/tracker.php
> %%WWWDIR%%/plugins/ScheduledReports/lang/ar.json
> %%WWWDIR%%/plugins/ScheduledReports/lang/be.json
> %%WWWDIR%%/plugins/ScheduledReports/lang/bg.json
>@@ -6133,7 +6009,6 @@
> %%WWWDIR%%/plugins/SegmentEditor/angularjs/segment-generator/segmentgenerator.directive.js
> %%WWWDIR%%/plugins/SegmentEditor/angularjs/segment-generator/segmentgenerator.directive.less
> %%WWWDIR%%/plugins/SegmentEditor/config/config.php
>-%%WWWDIR%%/plugins/SegmentEditor/config/tracker.php
> %%WWWDIR%%/plugins/SegmentEditor/images/ajax-loader.gif
> %%WWWDIR%%/plugins/SegmentEditor/images/bg-inverted-corners.png
> %%WWWDIR%%/plugins/SegmentEditor/images/bg-segment-search.png
>@@ -6204,8 +6079,6 @@
> %%WWWDIR%%/plugins/SitesManager/angularjs/sites-manager/sites-manager-site.controller.js
> %%WWWDIR%%/plugins/SitesManager/angularjs/sites-manager/sites-manager-type-model.js
> %%WWWDIR%%/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
>-%%WWWDIR%%/plugins/SitesManager/config/config.php
>-%%WWWDIR%%/plugins/SitesManager/config/tracker.php
> %%WWWDIR%%/plugins/SitesManager/lang/am.json
> %%WWWDIR%%/plugins/SitesManager/lang/ar.json
> %%WWWDIR%%/plugins/SitesManager/lang/be.json
>@@ -6750,46 +6623,12 @@
> %%WWWDIR%%/plugins/TagManager/templates/tagmanager.twig
> %%WWWDIR%%/plugins/TagManager/templates/trackingCode.twig
> %%WWWDIR%%/plugins/TagManager/templates/trackingHelp.twig
>-%%WWWDIR%%/plugins/Tour/API.php
>-%%WWWDIR%%/plugins/Tour/CHANGELOG.md
>-%%WWWDIR%%/plugins/Tour/Dao/DataFinder.php
>-%%WWWDIR%%/plugins/Tour/Engagement/Challenge.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeAddedAnnotation.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeAddedSegment.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeAddedUser.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeAddedWebsite.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeBrowseMarketplace.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeChangeVisualisation.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeConfigureGeolocation.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeCreatedGoal.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeCustomLogo.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeCustomiseDashboard.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeDisableBrowserArchiving.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeFlattenActions.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeScheduledReport.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeSelectDateRange.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeSetupTwoFa.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeTrackingCode.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeViewRowEvolution.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeViewVisitorProfile.php
>-%%WWWDIR%%/plugins/Tour/Engagement/ChallengeViewVisitsLog.php
>-%%WWWDIR%%/plugins/Tour/Engagement/Challenges.php
>-%%WWWDIR%%/plugins/Tour/Engagement/Levels.php
>-%%WWWDIR%%/plugins/Tour/Tour.php
>-%%WWWDIR%%/plugins/Tour/Widgets/GetEngagement.php
>-%%WWWDIR%%/plugins/Tour/config/test.php
>-%%WWWDIR%%/plugins/Tour/javascripts/engagement.js
>-%%WWWDIR%%/plugins/Tour/lang/en.json
>-%%WWWDIR%%/plugins/Tour/stylesheets/engagement.less
>-%%WWWDIR%%/plugins/Tour/templates/engagement.twig
> %%WWWDIR%%/plugins/Transitions/API.php
> %%WWWDIR%%/plugins/Transitions/Categories/TransitionsSubcategory.php
> %%WWWDIR%%/plugins/Transitions/Controller.php
> %%WWWDIR%%/plugins/Transitions/Transitions.php
> %%WWWDIR%%/plugins/Transitions/Widgets/GetTransitions.php
> %%WWWDIR%%/plugins/Transitions/angularjs/transitionswitcher/transitionswitcher.controller.js
>-%%WWWDIR%%/plugins/Transitions/config/config.php
>-%%WWWDIR%%/plugins/Transitions/config/tracker.php
> %%WWWDIR%%/plugins/Transitions/images/transitions_icon.png
> %%WWWDIR%%/plugins/Transitions/images/transitions_icon_hover.png
> %%WWWDIR%%/plugins/Transitions/javascripts/transitions.js
>@@ -6848,9 +6687,7 @@
> %%WWWDIR%%/plugins/TwoFactorAuth/TwoFactorAuthentication.php
> %%WWWDIR%%/plugins/TwoFactorAuth/Validator.php
> %%WWWDIR%%/plugins/TwoFactorAuth/angularjs/setuptwofactor/setuptwofactor.controller.js
>-%%WWWDIR%%/plugins/TwoFactorAuth/config/config.php
> %%WWWDIR%%/plugins/TwoFactorAuth/config/test.php
>-%%WWWDIR%%/plugins/TwoFactorAuth/config/tracker.php
> %%WWWDIR%%/plugins/TwoFactorAuth/javascripts/twofactorauth.js
> %%WWWDIR%%/plugins/TwoFactorAuth/lang/ar.json
> %%WWWDIR%%/plugins/TwoFactorAuth/lang/da.json
>@@ -6858,7 +6695,6 @@
> %%WWWDIR%%/plugins/TwoFactorAuth/lang/el.json
> %%WWWDIR%%/plugins/TwoFactorAuth/lang/en.json
> %%WWWDIR%%/plugins/TwoFactorAuth/lang/es.json
>-%%WWWDIR%%/plugins/TwoFactorAuth/lang/fi.json
> %%WWWDIR%%/plugins/TwoFactorAuth/lang/fr.json
> %%WWWDIR%%/plugins/TwoFactorAuth/lang/it.json
> %%WWWDIR%%/plugins/TwoFactorAuth/lang/ja.json
>@@ -6915,7 +6751,6 @@
> %%WWWDIR%%/plugins/UserCountry/angularjs/location-provider-updater/location-provider-updater.controller.js
> %%WWWDIR%%/plugins/UserCountry/angularjs/location-provider-updater/location-provider-updater.directive.js
> %%WWWDIR%%/plugins/UserCountry/config/config.php
>-%%WWWDIR%%/plugins/UserCountry/config/tracker.php
> %%WWWDIR%%/plugins/UserCountry/functions.php
> %%WWWDIR%%/plugins/UserCountry/lang/am.json
> %%WWWDIR%%/plugins/UserCountry/lang/ar.json
>@@ -6980,8 +6815,6 @@
> %%WWWDIR%%/plugins/UserCountryMap/UserCountryMap.php
> %%WWWDIR%%/plugins/UserCountryMap/Widgets/GetRealtimeMap.php
> %%WWWDIR%%/plugins/UserCountryMap/Widgets/GetVisitorMap.php
>-%%WWWDIR%%/plugins/UserCountryMap/config/config.php
>-%%WWWDIR%%/plugins/UserCountryMap/config/tracker.php
> %%WWWDIR%%/plugins/UserCountryMap/images/cities.png
> %%WWWDIR%%/plugins/UserCountryMap/images/realtimemap-loading.gif
> %%WWWDIR%%/plugins/UserCountryMap/images/regions.png
>@@ -7229,8 +7062,6 @@
> %%WWWDIR%%/plugins/UserId/Reports/Base.php
> %%WWWDIR%%/plugins/UserId/Reports/GetUsers.php
> %%WWWDIR%%/plugins/UserId/UserId.php
>-%%WWWDIR%%/plugins/UserId/config/config.php
>-%%WWWDIR%%/plugins/UserId/config/tracker.php
> %%WWWDIR%%/plugins/UserId/javascripts/rowaction.js
> %%WWWDIR%%/plugins/UserId/lang/am.json
> %%WWWDIR%%/plugins/UserId/lang/ar.json
>@@ -7292,8 +7123,6 @@
> %%WWWDIR%%/plugins/UserLanguage/Reports/GetLanguageCode.php
> %%WWWDIR%%/plugins/UserLanguage/UserLanguage.php
> %%WWWDIR%%/plugins/UserLanguage/VisitorDetails.php
>-%%WWWDIR%%/plugins/UserLanguage/config/config.php
>-%%WWWDIR%%/plugins/UserLanguage/config/tracker.php
> %%WWWDIR%%/plugins/UserLanguage/functions.php
> %%WWWDIR%%/plugins/UserLanguage/lang/am.json
> %%WWWDIR%%/plugins/UserLanguage/lang/ar.json
>@@ -7379,8 +7208,6 @@
> %%WWWDIR%%/plugins/UsersManager/angularjs/users-manager/users-manager.component.html
> %%WWWDIR%%/plugins/UsersManager/angularjs/users-manager/users-manager.component.js
> %%WWWDIR%%/plugins/UsersManager/angularjs/users-manager/users-manager.component.less
>-%%WWWDIR%%/plugins/UsersManager/config/config.php
>-%%WWWDIR%%/plugins/UsersManager/config/tracker.php
> %%WWWDIR%%/plugins/UsersManager/images/no-access.png
> %%WWWDIR%%/plugins/UsersManager/images/ok.png
> %%WWWDIR%%/plugins/UsersManager/lang/am.json
>@@ -7450,8 +7277,6 @@
> %%WWWDIR%%/plugins/VisitFrequency/Controller.php
> %%WWWDIR%%/plugins/VisitFrequency/Reports/Get.php
> %%WWWDIR%%/plugins/VisitFrequency/VisitFrequency.php
>-%%WWWDIR%%/plugins/VisitFrequency/config/config.php
>-%%WWWDIR%%/plugins/VisitFrequency/config/tracker.php
> %%WWWDIR%%/plugins/VisitFrequency/lang/am.json
> %%WWWDIR%%/plugins/VisitFrequency/lang/ar.json
> %%WWWDIR%%/plugins/VisitFrequency/lang/be.json
>@@ -7515,8 +7340,6 @@
> %%WWWDIR%%/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php
> %%WWWDIR%%/plugins/VisitTime/VisitTime.php
> %%WWWDIR%%/plugins/VisitTime/VisitorDetails.php
>-%%WWWDIR%%/plugins/VisitTime/config/config.php
>-%%WWWDIR%%/plugins/VisitTime/config/tracker.php
> %%WWWDIR%%/plugins/VisitTime/functions.php
> %%WWWDIR%%/plugins/VisitTime/lang/am.json
> %%WWWDIR%%/plugins/VisitTime/lang/ar.json
>@@ -7586,8 +7409,6 @@
> %%WWWDIR%%/plugins/VisitorInterest/Reports/GetNumberOfVisitsPerVisitDuration.php
> %%WWWDIR%%/plugins/VisitorInterest/VisitorDetails.php
> %%WWWDIR%%/plugins/VisitorInterest/VisitorInterest.php
>-%%WWWDIR%%/plugins/VisitorInterest/config/config.php
>-%%WWWDIR%%/plugins/VisitorInterest/config/tracker.php
> %%WWWDIR%%/plugins/VisitorInterest/lang/am.json
> %%WWWDIR%%/plugins/VisitorInterest/lang/ar.json
> %%WWWDIR%%/plugins/VisitorInterest/lang/be.json
>@@ -7644,8 +7465,6 @@
> %%WWWDIR%%/plugins/VisitsSummary/Reports/Get.php
> %%WWWDIR%%/plugins/VisitsSummary/VisitsSummary.php
> %%WWWDIR%%/plugins/VisitsSummary/Widgets/Index.php
>-%%WWWDIR%%/plugins/VisitsSummary/config/config.php
>-%%WWWDIR%%/plugins/VisitsSummary/config/tracker.php
> %%WWWDIR%%/plugins/VisitsSummary/lang/am.json
> %%WWWDIR%%/plugins/VisitsSummary/lang/ar.json
> %%WWWDIR%%/plugins/VisitsSummary/lang/be.json
>@@ -7706,8 +7525,6 @@
> %%WWWDIR%%/plugins/WebsiteMeasurable/Settings/Urls.php
> %%WWWDIR%%/plugins/WebsiteMeasurable/Type.php
> %%WWWDIR%%/plugins/WebsiteMeasurable/WebsiteMeasurable.php
>-%%WWWDIR%%/plugins/WebsiteMeasurable/config/config.php
>-%%WWWDIR%%/plugins/WebsiteMeasurable/config/tracker.php
> %%WWWDIR%%/plugins/WebsiteMeasurable/lang/am.json
> %%WWWDIR%%/plugins/WebsiteMeasurable/lang/ar.json
> %%WWWDIR%%/plugins/WebsiteMeasurable/lang/be.json
>@@ -7758,8 +7575,6 @@
> %%WWWDIR%%/plugins/Widgetize/Widgetize.php
> %%WWWDIR%%/plugins/Widgetize/angularjs/export-widget/export-widget.controller.js
> %%WWWDIR%%/plugins/Widgetize/angularjs/widget-preview/widget-preview.directive.js
>-%%WWWDIR%%/plugins/Widgetize/config/config.php
>-%%WWWDIR%%/plugins/Widgetize/config/tracker.php
> %%WWWDIR%%/plugins/Widgetize/lang/ar.json
> %%WWWDIR%%/plugins/Widgetize/lang/be.json
> %%WWWDIR%%/plugins/Widgetize/lang/bg.json
>@@ -7950,12 +7765,6 @@
> %%WWWDIR%%/vendor/leafo/lessphp/lessify.inc.php
> %%WWWDIR%%/vendor/leafo/lessphp/package.sh
> %%WWWDIR%%/vendor/leafo/lessphp/plessc
>-%%WWWDIR%%/vendor/matomo-org/jshrink/CONTRIBUTING.md
>-%%WWWDIR%%/vendor/matomo-org/jshrink/LICENSE
>-%%WWWDIR%%/vendor/matomo-org/jshrink/README.md
>-%%WWWDIR%%/vendor/matomo-org/jshrink/composer.json
>-%%WWWDIR%%/vendor/matomo-org/jshrink/phpunit.xml.dist
>-%%WWWDIR%%/vendor/matomo-org/jshrink/src/JShrink/Minifier.php
> %%WWWDIR%%/vendor/matomo/referrer-spam-blacklist/CONTRIBUTING.md
> %%WWWDIR%%/vendor/matomo/referrer-spam-blacklist/README.md
> %%WWWDIR%%/vendor/matomo/referrer-spam-blacklist/composer.json
>@@ -7965,6 +7774,12 @@
> %%WWWDIR%%/vendor/matomo/searchengine-and-social-list/Socials.yml
> %%WWWDIR%%/vendor/matomo/searchengine-and-social-list/composer.json
> %%WWWDIR%%/vendor/matomo/searchengine-and-social-list/package.json
>+%%WWWDIR%%/vendor/matomo-org/jshrink/CONTRIBUTING.md
>+%%WWWDIR%%/vendor/matomo-org/jshrink/LICENSE
>+%%WWWDIR%%/vendor/matomo-org/jshrink/README.md
>+%%WWWDIR%%/vendor/matomo-org/jshrink/composer.json
>+%%WWWDIR%%/vendor/matomo-org/jshrink/phpunit.xml.dist
>+%%WWWDIR%%/vendor/matomo-org/jshrink/src/JShrink/Minifier.php
> %%WWWDIR%%/vendor/maxmind-db/reader/LICENSE
> %%WWWDIR%%/vendor/maxmind-db/reader/README.md
> %%WWWDIR%%/vendor/maxmind-db/reader/composer.json
>@@ -8256,7 +8071,6 @@
> %%WWWDIR%%/vendor/piwik/device-detector/Cache/PSR6Bridge.php
> %%WWWDIR%%/vendor/piwik/device-detector/Cache/StaticCache.php
> %%WWWDIR%%/vendor/piwik/device-detector/DeviceDetector.php
>-%%WWWDIR%%/vendor/piwik/device-detector/LICENSE
> %%WWWDIR%%/vendor/piwik/device-detector/Parser/Bot.php
> %%WWWDIR%%/vendor/piwik/device-detector/Parser/BotParserAbstract.php
> %%WWWDIR%%/vendor/piwik/device-detector/Parser/Client/Browser.php
>@@ -8624,7 +8438,6 @@
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/Node/BlockReference.php
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/Node/Body.php
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
>-%%WWWDIR%%/vendor/twig/twig/lib/Twig/Node/Deprecated.php
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/Node/Do.php
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/Node/Embed.php
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/Node/Expression.php
>@@ -8746,7 +8559,6 @@
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/TokenParser.php
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/TokenParser/Block.php
>-%%WWWDIR%%/vendor/twig/twig/lib/Twig/TokenParser/Deprecated.php
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/TokenParser/Do.php
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
> %%WWWDIR%%/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
>@@ -8807,8 +8619,6 @@
> %%WWWDIR%%/vendor/twig/twig/src/Node/BlockReferenceNode.php
> %%WWWDIR%%/vendor/twig/twig/src/Node/BodyNode.php
> %%WWWDIR%%/vendor/twig/twig/src/Node/CheckSecurityNode.php
>-%%WWWDIR%%/vendor/twig/twig/src/Node/CheckToStringNode.php
>-%%WWWDIR%%/vendor/twig/twig/src/Node/DeprecatedNode.php
> %%WWWDIR%%/vendor/twig/twig/src/Node/DoNode.php
> %%WWWDIR%%/vendor/twig/twig/src/Node/EmbedNode.php
> %%WWWDIR%%/vendor/twig/twig/src/Node/Expression/AbstractExpression.php
>@@ -8920,7 +8730,6 @@
> %%WWWDIR%%/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php
> %%WWWDIR%%/vendor/twig/twig/src/TokenParser/AutoEscapeTokenParser.php
> %%WWWDIR%%/vendor/twig/twig/src/TokenParser/BlockTokenParser.php
>-%%WWWDIR%%/vendor/twig/twig/src/TokenParser/DeprecatedTokenParser.php
> %%WWWDIR%%/vendor/twig/twig/src/TokenParser/DoTokenParser.php
> %%WWWDIR%%/vendor/twig/twig/src/TokenParser/EmbedTokenParser.php
> %%WWWDIR%%/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php
>diff --git a/www/mediawiki133/Makefile b/www/mediawiki133/Makefile
>deleted file mode 100644
>index 3decfedd8476..000000000000
>--- a/www/mediawiki133/Makefile
>+++ /dev/null
>@@ -1,69 +0,0 @@
>-# Created by: Gerrit Beine <tux@pinguru.net>
>-# $FreeBSD$
>-
>-PORTNAME=	mediawiki
>-PORTVERSION=	1.33.0
>-CATEGORIES=	www
>-MASTER_SITES=	http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/
>-PKGNAMESUFFIX=	133${PHP_PKGNAMESUFFIX}
>-
>-MAINTAINER=	wen@FreeBSD.org
>-COMMENT=	Wiki engine used by Wikipedia
>-
>-LICENSE=	GPLv2
>-
>-CONFLICTS=	mediawiki131-[0-9]* mediawiki132-[0-9]*
>-
>-USES=		php:flavors shebangfix
>-SHEBANG_FILES=	maintenance/dev/*.sh \
>-		maintenance/postgres/*.pl \
>-		maintenance/storage/make-blobs \
>-		includes/shell/limit.sh
>-SHEBANG_LANG=	hhvm
>-hhvm_OLD_CMD=	/usr/bin/hhvm
>-hhvm_CMD=	${LOCALBASE}/bin/hhvm # not installed by anything yet
>-USE_PHP=	ctype dom fileinfo hash iconv intl json mbstring openssl pcre \
>-		readline session xml xmlreader zlib
>-MEDIAWIKIDIR?=	www/mediawiki
>-
>-NO_BUILD=	yes
>-PLIST=		${WRKDIR}/plist
>-
>-SUB_FILES=	pkg-message
>-SUB_LIST=	MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR}
>-
>-OPTIONS_DEFINE=	LDAP MEMCACHED IMAGICK SOCKETS
>-OPTIONS_SINGLE=	DB
>-OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
>-OPTIONS_DEFAULT=	MYSQL SOCKETS
>-
>-MEMCACHED_DESC=	Use memcached
>-IMAGICK_DESC=	Use ImageMagick
>-SOCKETS_DESC=	Use sockets
>-
>-MYSQL_USE=	mysql=client php=mysqli
>-PGSQL_USE=	php=pgsql
>-SQLITE_USE=	php=sqlite3
>-LDAP_USE=	php=ldap
>-SOCKETS_USE=	php=sockets
>-
>-MEMCACHED_RUN_DEPENDS=	memcached:databases/memcached
>-IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
>-
>-pre-install:
>-	@${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST}
>-	@${ECHO} "@dir %%WWWDIR%%/cache" >> ${PLIST}
>-	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
>-	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
>-	@${ECHO} "@mode 0755" >> ${PLIST}
>-	@${ECHO} "@dir %%WWWDIR%%/images" >> ${PLIST}
>-	@${ECHO} "@mode" >> ${PLIST}
>-	@${ECHO_CMD} "@owner" >> ${PLIST}
>-	@${ECHO_CMD} "@group" >> ${PLIST}
>-	@${ECHO} @dir ${MEDIAWIKIDIR} >> ${PLIST}
>-
>-do-install:
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
>-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
>-
>-.include <bsd.port.mk>
>diff --git a/www/mediawiki133/distinfo b/www/mediawiki133/distinfo
>deleted file mode 100644
>index c0ebbd87218a..000000000000
>--- a/www/mediawiki133/distinfo
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1562338139
>-SHA256 (mediawiki-1.33.0.tar.gz) = 8335a2d8740c5dd5919a480b74c3d8e19f23a68b396df48c2d77646272fdcd67
>-SIZE (mediawiki-1.33.0.tar.gz) = 37861409
>diff --git a/www/mediawiki133/files/pkg-message.in b/www/mediawiki133/files/pkg-message.in
>deleted file mode 100644
>index d98978fe6903..000000000000
>--- a/www/mediawiki133/files/pkg-message.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>-
>-	**** NOTE ****
>-Remember to check
>-
>-%%MEDIAWIKIDIR%%/INSTALL
>-
>-and
>-
>-%%MEDIAWIKIDIR%%/UPGRADE
>-
>-for details
>diff --git a/www/mediawiki133/pkg-descr b/www/mediawiki133/pkg-descr
>deleted file mode 100644
>index dac83f83ccda..000000000000
>--- a/www/mediawiki133/pkg-descr
>+++ /dev/null
>@@ -1,6 +0,0 @@
>-MediaWiki is the collaborative editing software that runs Wikipedia,
>-the free encyclopedia, and other projects.
>-It's designed to handle a large number of users and pages without imposing
>-too rigid a structure or workflow.
>-
>-WWW: http://www.mediawiki.org/
>diff --git a/www/mod_pagespeed/Makefile b/www/mod_pagespeed/Makefile
>index f0f3ae565581..ef7b499e2519 100644
>--- a/www/mod_pagespeed/Makefile
>+++ b/www/mod_pagespeed/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	mod_pagespeed
> PORTVERSION=	1.12.34.2
>-PORTREVISION=	22
>+PORTREVISION=	21
> PORTEPOCH=	1
> CATEGORIES=	www devel
> MASTER_SITES=	LOCAL/mmokhi:boringssl,chromium_base,chromium_build,googleurl,gflags_arch,gflags_src,libjpeg_turbo_src,yasm_patched,libwebp,modpb64 \
>diff --git a/www/nextcloud-contacts/Makefile b/www/nextcloud-contacts/Makefile
>index 85e9dbb625b8..f649f51bc14f 100644
>--- a/www/nextcloud-contacts/Makefile
>+++ b/www/nextcloud-contacts/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	contacts
>-PORTVERSION=	3.1.3
>+PORTVERSION=	3.1.1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> MASTER_SITES=	https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/
>diff --git a/www/nextcloud-contacts/distinfo b/www/nextcloud-contacts/distinfo
>index 449450d3718c..e5c67101c6c6 100644
>--- a/www/nextcloud-contacts/distinfo
>+++ b/www/nextcloud-contacts/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562411148
>-SHA256 (nextcloud/contacts-v3.1.3/contacts.tar.gz) = c66ff52d41262e209397a7b47843bce03aeed7f1d097590d89db70ffd678ad65
>-SIZE (nextcloud/contacts-v3.1.3/contacts.tar.gz) = 1954547
>+TIMESTAMP = 1556203290
>+SHA256 (nextcloud/contacts-v3.1.1/contacts.tar.gz) = fbc4f3b7936aba9ef61710c86d70650c1746b8a7df7f29b0a964dd70c528d6e1
>+SIZE (nextcloud/contacts-v3.1.1/contacts.tar.gz) = 1718914
>diff --git a/www/nextcloud-contacts/pkg-plist b/www/nextcloud-contacts/pkg-plist
>index b5b340610e11..dc4f0c0f63b0 100644
>--- a/www/nextcloud-contacts/pkg-plist
>+++ b/www/nextcloud-contacts/pkg-plist
>@@ -33,262 +33,262 @@
> %%WWWDIR%%/img/qrcode.svg
> %%WWWDIR%%/img/social.svg
> %%WWWDIR%%/img/up.svg
>-%%WWWDIR%%/js/chunks/contacts.0.55f53fe0da92c59639ac.js
>-%%WWWDIR%%/js/chunks/contacts.0.55f53fe0da92c59639ac.js.map
>-%%WWWDIR%%/js/chunks/contacts.1.740823c383aa56edc63b.js
>-%%WWWDIR%%/js/chunks/contacts.1.740823c383aa56edc63b.js.map
>-%%WWWDIR%%/js/chunks/contacts.10.d9f14253a949d933d9cc.js
>-%%WWWDIR%%/js/chunks/contacts.10.d9f14253a949d933d9cc.js.map
>-%%WWWDIR%%/js/chunks/contacts.100.a7f22039952dd091d2d9.js
>-%%WWWDIR%%/js/chunks/contacts.100.a7f22039952dd091d2d9.js.map
>-%%WWWDIR%%/js/chunks/contacts.101.3490129bef62a9853a7a.js
>-%%WWWDIR%%/js/chunks/contacts.101.3490129bef62a9853a7a.js.map
>-%%WWWDIR%%/js/chunks/contacts.102.4499aab1210e6408cf78.js
>-%%WWWDIR%%/js/chunks/contacts.102.4499aab1210e6408cf78.js.map
>-%%WWWDIR%%/js/chunks/contacts.103.80745a02d75249d1535c.js
>-%%WWWDIR%%/js/chunks/contacts.103.80745a02d75249d1535c.js.map
>-%%WWWDIR%%/js/chunks/contacts.104.2e9ae292ec425ece36de.js
>-%%WWWDIR%%/js/chunks/contacts.104.2e9ae292ec425ece36de.js.map
>-%%WWWDIR%%/js/chunks/contacts.105.1a5d01c4f732f382f8cc.js
>-%%WWWDIR%%/js/chunks/contacts.105.1a5d01c4f732f382f8cc.js.map
>-%%WWWDIR%%/js/chunks/contacts.106.f1d93a48f10c080a1128.js
>-%%WWWDIR%%/js/chunks/contacts.106.f1d93a48f10c080a1128.js.map
>-%%WWWDIR%%/js/chunks/contacts.107.34f13d7f58520d748653.js
>-%%WWWDIR%%/js/chunks/contacts.107.34f13d7f58520d748653.js.map
>-%%WWWDIR%%/js/chunks/contacts.108.3203470aae1e2263e22f.js
>-%%WWWDIR%%/js/chunks/contacts.108.3203470aae1e2263e22f.js.map
>-%%WWWDIR%%/js/chunks/contacts.109.2a41fbf885bcb5bd124f.js
>-%%WWWDIR%%/js/chunks/contacts.109.2a41fbf885bcb5bd124f.js.map
>-%%WWWDIR%%/js/chunks/contacts.11.f76f02d70f0deec90377.js
>-%%WWWDIR%%/js/chunks/contacts.11.f76f02d70f0deec90377.js.map
>-%%WWWDIR%%/js/chunks/contacts.110.15703c2b22118e473465.js
>-%%WWWDIR%%/js/chunks/contacts.110.15703c2b22118e473465.js.map
>-%%WWWDIR%%/js/chunks/contacts.111.6b53d9ab694f5dd7f003.js
>-%%WWWDIR%%/js/chunks/contacts.111.6b53d9ab694f5dd7f003.js.map
>-%%WWWDIR%%/js/chunks/contacts.112.f43c6cb371e7b10c7a1c.js
>-%%WWWDIR%%/js/chunks/contacts.112.f43c6cb371e7b10c7a1c.js.map
>-%%WWWDIR%%/js/chunks/contacts.113.c53f84d7101fa808a1f7.js
>-%%WWWDIR%%/js/chunks/contacts.113.c53f84d7101fa808a1f7.js.map
>-%%WWWDIR%%/js/chunks/contacts.114.92388a80187e99b123cb.js
>-%%WWWDIR%%/js/chunks/contacts.114.92388a80187e99b123cb.js.map
>-%%WWWDIR%%/js/chunks/contacts.115.065e234675f1d167c199.js
>-%%WWWDIR%%/js/chunks/contacts.115.065e234675f1d167c199.js.map
>-%%WWWDIR%%/js/chunks/contacts.116.a859cdecad4e643e9db8.js
>-%%WWWDIR%%/js/chunks/contacts.116.a859cdecad4e643e9db8.js.map
>-%%WWWDIR%%/js/chunks/contacts.117.99d2172ed97bab5068a2.js
>-%%WWWDIR%%/js/chunks/contacts.117.99d2172ed97bab5068a2.js.map
>-%%WWWDIR%%/js/chunks/contacts.118.d241f80e661482387354.js
>-%%WWWDIR%%/js/chunks/contacts.118.d241f80e661482387354.js.map
>-%%WWWDIR%%/js/chunks/contacts.119.32e24024ef0304ec9344.js
>-%%WWWDIR%%/js/chunks/contacts.119.32e24024ef0304ec9344.js.map
>-%%WWWDIR%%/js/chunks/contacts.12.16fd884af0fb15c76c88.js
>-%%WWWDIR%%/js/chunks/contacts.12.16fd884af0fb15c76c88.js.map
>-%%WWWDIR%%/js/chunks/contacts.120.236bc5cbf405d25d12ad.js
>-%%WWWDIR%%/js/chunks/contacts.120.236bc5cbf405d25d12ad.js.map
>-%%WWWDIR%%/js/chunks/contacts.121.86ff47ad13c5e3746f2b.js
>-%%WWWDIR%%/js/chunks/contacts.121.86ff47ad13c5e3746f2b.js.map
>-%%WWWDIR%%/js/chunks/contacts.122.6e53736016f520b920f6.js
>-%%WWWDIR%%/js/chunks/contacts.122.6e53736016f520b920f6.js.map
>-%%WWWDIR%%/js/chunks/contacts.123.fc316a40d1e2658056df.js
>-%%WWWDIR%%/js/chunks/contacts.123.fc316a40d1e2658056df.js.map
>-%%WWWDIR%%/js/chunks/contacts.124.5f338b2f3eb77ae09630.js
>-%%WWWDIR%%/js/chunks/contacts.124.5f338b2f3eb77ae09630.js.map
>-%%WWWDIR%%/js/chunks/contacts.125.f46e24f4f8d9e4b05322.js
>-%%WWWDIR%%/js/chunks/contacts.125.f46e24f4f8d9e4b05322.js.map
>-%%WWWDIR%%/js/chunks/contacts.126.e864fd2f10eca9dea4da.js
>-%%WWWDIR%%/js/chunks/contacts.126.e864fd2f10eca9dea4da.js.map
>-%%WWWDIR%%/js/chunks/contacts.128.d69fb027c5cfa3504c41.js
>-%%WWWDIR%%/js/chunks/contacts.128.d69fb027c5cfa3504c41.js.map
>-%%WWWDIR%%/js/chunks/contacts.13.325f386782c91edce63f.js
>-%%WWWDIR%%/js/chunks/contacts.13.325f386782c91edce63f.js.map
>-%%WWWDIR%%/js/chunks/contacts.14.4324ec620d64a6b4cb67.js
>-%%WWWDIR%%/js/chunks/contacts.14.4324ec620d64a6b4cb67.js.map
>-%%WWWDIR%%/js/chunks/contacts.15.79e0f2dddd004fbe44f1.js
>-%%WWWDIR%%/js/chunks/contacts.15.79e0f2dddd004fbe44f1.js.map
>-%%WWWDIR%%/js/chunks/contacts.16.2c6d6644af7a7ab9e348.js
>-%%WWWDIR%%/js/chunks/contacts.16.2c6d6644af7a7ab9e348.js.map
>-%%WWWDIR%%/js/chunks/contacts.17.f2c4a9c8dc76ea69ebf2.js
>-%%WWWDIR%%/js/chunks/contacts.17.f2c4a9c8dc76ea69ebf2.js.map
>-%%WWWDIR%%/js/chunks/contacts.18.1fb893732c3feeeebabe.js
>-%%WWWDIR%%/js/chunks/contacts.18.1fb893732c3feeeebabe.js.map
>-%%WWWDIR%%/js/chunks/contacts.19.820062c772f2577b4038.js
>-%%WWWDIR%%/js/chunks/contacts.19.820062c772f2577b4038.js.map
>-%%WWWDIR%%/js/chunks/contacts.2.8e1c2cf0f4777bc7fbd9.js
>-%%WWWDIR%%/js/chunks/contacts.2.8e1c2cf0f4777bc7fbd9.js.map
>-%%WWWDIR%%/js/chunks/contacts.20.4a6ee89ad3e612dd62d2.js
>-%%WWWDIR%%/js/chunks/contacts.20.4a6ee89ad3e612dd62d2.js.map
>-%%WWWDIR%%/js/chunks/contacts.21.760379c4bbc720e0310e.js
>-%%WWWDIR%%/js/chunks/contacts.21.760379c4bbc720e0310e.js.map
>-%%WWWDIR%%/js/chunks/contacts.22.fb1c7ae6c523b582c7bf.js
>-%%WWWDIR%%/js/chunks/contacts.22.fb1c7ae6c523b582c7bf.js.map
>-%%WWWDIR%%/js/chunks/contacts.23.e0b6993db7a12b185155.js
>-%%WWWDIR%%/js/chunks/contacts.23.e0b6993db7a12b185155.js.map
>-%%WWWDIR%%/js/chunks/contacts.24.8f378fd973ee69635a2c.js
>-%%WWWDIR%%/js/chunks/contacts.24.8f378fd973ee69635a2c.js.map
>-%%WWWDIR%%/js/chunks/contacts.25.7c397115645199fab01d.js
>-%%WWWDIR%%/js/chunks/contacts.25.7c397115645199fab01d.js.map
>-%%WWWDIR%%/js/chunks/contacts.26.5a1de3688cbadb1b1f8f.js
>-%%WWWDIR%%/js/chunks/contacts.26.5a1de3688cbadb1b1f8f.js.map
>-%%WWWDIR%%/js/chunks/contacts.27.866c9c8265ac57cd54ab.js
>-%%WWWDIR%%/js/chunks/contacts.27.866c9c8265ac57cd54ab.js.map
>-%%WWWDIR%%/js/chunks/contacts.28.f22f446858d53c4ed29e.js
>-%%WWWDIR%%/js/chunks/contacts.28.f22f446858d53c4ed29e.js.map
>-%%WWWDIR%%/js/chunks/contacts.29.0f7563e70dce64a737ed.js
>-%%WWWDIR%%/js/chunks/contacts.29.0f7563e70dce64a737ed.js.map
>-%%WWWDIR%%/js/chunks/contacts.3.fc0bb6d5a45feeaaf113.js
>-%%WWWDIR%%/js/chunks/contacts.3.fc0bb6d5a45feeaaf113.js.map
>-%%WWWDIR%%/js/chunks/contacts.30.1a853c0da132b0395260.js
>-%%WWWDIR%%/js/chunks/contacts.30.1a853c0da132b0395260.js.map
>-%%WWWDIR%%/js/chunks/contacts.31.e840cce721cec5cb0b0d.js
>-%%WWWDIR%%/js/chunks/contacts.31.e840cce721cec5cb0b0d.js.map
>-%%WWWDIR%%/js/chunks/contacts.32.32a07396a9f652d04cab.js
>-%%WWWDIR%%/js/chunks/contacts.32.32a07396a9f652d04cab.js.map
>-%%WWWDIR%%/js/chunks/contacts.33.d3525ee678900e2f4428.js
>-%%WWWDIR%%/js/chunks/contacts.33.d3525ee678900e2f4428.js.map
>-%%WWWDIR%%/js/chunks/contacts.34.e07f63e471bbae28616c.js
>-%%WWWDIR%%/js/chunks/contacts.34.e07f63e471bbae28616c.js.map
>-%%WWWDIR%%/js/chunks/contacts.35.3fc9ddfff23eff2b5db6.js
>-%%WWWDIR%%/js/chunks/contacts.35.3fc9ddfff23eff2b5db6.js.map
>-%%WWWDIR%%/js/chunks/contacts.36.300410ee175d76d3cdb7.js
>-%%WWWDIR%%/js/chunks/contacts.36.300410ee175d76d3cdb7.js.map
>-%%WWWDIR%%/js/chunks/contacts.37.a1793b89ba54c97911c5.js
>-%%WWWDIR%%/js/chunks/contacts.37.a1793b89ba54c97911c5.js.map
>-%%WWWDIR%%/js/chunks/contacts.38.4610e3be8eed71584fe4.js
>-%%WWWDIR%%/js/chunks/contacts.38.4610e3be8eed71584fe4.js.map
>-%%WWWDIR%%/js/chunks/contacts.39.26b0efff37b5c7033d38.js
>-%%WWWDIR%%/js/chunks/contacts.39.26b0efff37b5c7033d38.js.map
>-%%WWWDIR%%/js/chunks/contacts.4.1dd26a0bb69f0a661c68.js
>-%%WWWDIR%%/js/chunks/contacts.4.1dd26a0bb69f0a661c68.js.map
>-%%WWWDIR%%/js/chunks/contacts.40.b4686eb4b863742e802f.js
>-%%WWWDIR%%/js/chunks/contacts.40.b4686eb4b863742e802f.js.map
>-%%WWWDIR%%/js/chunks/contacts.41.5bb2ee8c1d20a2558fec.js
>-%%WWWDIR%%/js/chunks/contacts.41.5bb2ee8c1d20a2558fec.js.map
>-%%WWWDIR%%/js/chunks/contacts.42.fc65c8ba6afe0d2bd9f7.js
>-%%WWWDIR%%/js/chunks/contacts.42.fc65c8ba6afe0d2bd9f7.js.map
>-%%WWWDIR%%/js/chunks/contacts.43.8240b2fc3103d8f5232d.js
>-%%WWWDIR%%/js/chunks/contacts.43.8240b2fc3103d8f5232d.js.map
>-%%WWWDIR%%/js/chunks/contacts.44.08910c8af3605c180d10.js
>-%%WWWDIR%%/js/chunks/contacts.44.08910c8af3605c180d10.js.map
>-%%WWWDIR%%/js/chunks/contacts.45.df57e8251679d7c7d323.js
>-%%WWWDIR%%/js/chunks/contacts.45.df57e8251679d7c7d323.js.map
>-%%WWWDIR%%/js/chunks/contacts.46.c96abf02417abc9216eb.js
>-%%WWWDIR%%/js/chunks/contacts.46.c96abf02417abc9216eb.js.map
>-%%WWWDIR%%/js/chunks/contacts.47.5cd889c6c696c440f94b.js
>-%%WWWDIR%%/js/chunks/contacts.47.5cd889c6c696c440f94b.js.map
>-%%WWWDIR%%/js/chunks/contacts.48.0e0d05c7d061a20c18cf.js
>-%%WWWDIR%%/js/chunks/contacts.48.0e0d05c7d061a20c18cf.js.map
>-%%WWWDIR%%/js/chunks/contacts.49.5a740b99acf53eb83f7c.js
>-%%WWWDIR%%/js/chunks/contacts.49.5a740b99acf53eb83f7c.js.map
>-%%WWWDIR%%/js/chunks/contacts.5.1ebc5d563377611e2fbc.js
>-%%WWWDIR%%/js/chunks/contacts.5.1ebc5d563377611e2fbc.js.map
>-%%WWWDIR%%/js/chunks/contacts.50.38dd1b5da5b20a3a3652.js
>-%%WWWDIR%%/js/chunks/contacts.50.38dd1b5da5b20a3a3652.js.map
>-%%WWWDIR%%/js/chunks/contacts.51.3962d3c70f14a3497d75.js
>-%%WWWDIR%%/js/chunks/contacts.51.3962d3c70f14a3497d75.js.map
>-%%WWWDIR%%/js/chunks/contacts.52.ac1ba5fd6e9322e42cd9.js
>-%%WWWDIR%%/js/chunks/contacts.52.ac1ba5fd6e9322e42cd9.js.map
>-%%WWWDIR%%/js/chunks/contacts.53.740ce9875605c2856dd3.js
>-%%WWWDIR%%/js/chunks/contacts.53.740ce9875605c2856dd3.js.map
>-%%WWWDIR%%/js/chunks/contacts.54.b5ca5233d33bc7b0217f.js
>-%%WWWDIR%%/js/chunks/contacts.54.b5ca5233d33bc7b0217f.js.map
>-%%WWWDIR%%/js/chunks/contacts.55.d0633bcbf8dbbc5c346c.js
>-%%WWWDIR%%/js/chunks/contacts.55.d0633bcbf8dbbc5c346c.js.map
>-%%WWWDIR%%/js/chunks/contacts.56.7b645d1c40e48ee5258c.js
>-%%WWWDIR%%/js/chunks/contacts.56.7b645d1c40e48ee5258c.js.map
>-%%WWWDIR%%/js/chunks/contacts.57.cf54e810df1b9fa8adb8.js
>-%%WWWDIR%%/js/chunks/contacts.57.cf54e810df1b9fa8adb8.js.map
>-%%WWWDIR%%/js/chunks/contacts.58.1def78fa04922e0ed457.js
>-%%WWWDIR%%/js/chunks/contacts.58.1def78fa04922e0ed457.js.map
>-%%WWWDIR%%/js/chunks/contacts.59.0d8f745908b444ee5b12.js
>-%%WWWDIR%%/js/chunks/contacts.59.0d8f745908b444ee5b12.js.map
>-%%WWWDIR%%/js/chunks/contacts.6.3730260fc4bc3a8b8c4f.js
>-%%WWWDIR%%/js/chunks/contacts.6.3730260fc4bc3a8b8c4f.js.map
>-%%WWWDIR%%/js/chunks/contacts.60.864ad3e69dc60ac9d15e.js
>-%%WWWDIR%%/js/chunks/contacts.60.864ad3e69dc60ac9d15e.js.map
>-%%WWWDIR%%/js/chunks/contacts.61.3a7235cab8755f39f2c3.js
>-%%WWWDIR%%/js/chunks/contacts.61.3a7235cab8755f39f2c3.js.map
>-%%WWWDIR%%/js/chunks/contacts.62.36e0813cb8b447f4d2db.js
>-%%WWWDIR%%/js/chunks/contacts.62.36e0813cb8b447f4d2db.js.map
>-%%WWWDIR%%/js/chunks/contacts.63.11157b3005cbcd1f8d4e.js
>-%%WWWDIR%%/js/chunks/contacts.63.11157b3005cbcd1f8d4e.js.map
>-%%WWWDIR%%/js/chunks/contacts.64.dca64132957b8722ca09.js
>-%%WWWDIR%%/js/chunks/contacts.64.dca64132957b8722ca09.js.map
>-%%WWWDIR%%/js/chunks/contacts.65.15f173bc34e6c9b0c60a.js
>-%%WWWDIR%%/js/chunks/contacts.65.15f173bc34e6c9b0c60a.js.map
>-%%WWWDIR%%/js/chunks/contacts.66.80f78a8938bcc28bb31a.js
>-%%WWWDIR%%/js/chunks/contacts.66.80f78a8938bcc28bb31a.js.map
>-%%WWWDIR%%/js/chunks/contacts.67.83cb0c0ccdaa3c690aef.js
>-%%WWWDIR%%/js/chunks/contacts.67.83cb0c0ccdaa3c690aef.js.map
>-%%WWWDIR%%/js/chunks/contacts.68.c0f5ad13474a57651e62.js
>-%%WWWDIR%%/js/chunks/contacts.68.c0f5ad13474a57651e62.js.map
>-%%WWWDIR%%/js/chunks/contacts.69.167b9a9cb185dfdc7143.js
>-%%WWWDIR%%/js/chunks/contacts.69.167b9a9cb185dfdc7143.js.map
>-%%WWWDIR%%/js/chunks/contacts.7.c3d5f87f3639d5bbc6f8.js
>-%%WWWDIR%%/js/chunks/contacts.7.c3d5f87f3639d5bbc6f8.js.map
>-%%WWWDIR%%/js/chunks/contacts.70.65229a5c1dad7d4d4e75.js
>-%%WWWDIR%%/js/chunks/contacts.70.65229a5c1dad7d4d4e75.js.map
>-%%WWWDIR%%/js/chunks/contacts.71.23e6c589228394679338.js
>-%%WWWDIR%%/js/chunks/contacts.71.23e6c589228394679338.js.map
>-%%WWWDIR%%/js/chunks/contacts.72.a151550588c66dc6861a.js
>-%%WWWDIR%%/js/chunks/contacts.72.a151550588c66dc6861a.js.map
>-%%WWWDIR%%/js/chunks/contacts.73.879c0c562bbea0b7dd20.js
>-%%WWWDIR%%/js/chunks/contacts.73.879c0c562bbea0b7dd20.js.map
>-%%WWWDIR%%/js/chunks/contacts.74.32c37e8f963920760248.js
>-%%WWWDIR%%/js/chunks/contacts.74.32c37e8f963920760248.js.map
>-%%WWWDIR%%/js/chunks/contacts.75.a75f74f5972469f203f7.js
>-%%WWWDIR%%/js/chunks/contacts.75.a75f74f5972469f203f7.js.map
>-%%WWWDIR%%/js/chunks/contacts.76.1295ae8dba5a050bf94e.js
>-%%WWWDIR%%/js/chunks/contacts.76.1295ae8dba5a050bf94e.js.map
>-%%WWWDIR%%/js/chunks/contacts.77.319a6a85c4ce17296d6c.js
>-%%WWWDIR%%/js/chunks/contacts.77.319a6a85c4ce17296d6c.js.map
>-%%WWWDIR%%/js/chunks/contacts.78.86a7878d9def7af07c84.js
>-%%WWWDIR%%/js/chunks/contacts.78.86a7878d9def7af07c84.js.map
>-%%WWWDIR%%/js/chunks/contacts.79.bef5c9ea15944a1c2369.js
>-%%WWWDIR%%/js/chunks/contacts.79.bef5c9ea15944a1c2369.js.map
>-%%WWWDIR%%/js/chunks/contacts.8.35d32e1868ac54d61265.js
>-%%WWWDIR%%/js/chunks/contacts.8.35d32e1868ac54d61265.js.map
>-%%WWWDIR%%/js/chunks/contacts.80.88ad49ffee3deab3abbc.js
>-%%WWWDIR%%/js/chunks/contacts.80.88ad49ffee3deab3abbc.js.map
>-%%WWWDIR%%/js/chunks/contacts.81.f279c92f6e03ce2cfa99.js
>-%%WWWDIR%%/js/chunks/contacts.81.f279c92f6e03ce2cfa99.js.map
>-%%WWWDIR%%/js/chunks/contacts.82.87498575d10f2c73fb19.js
>-%%WWWDIR%%/js/chunks/contacts.82.87498575d10f2c73fb19.js.map
>-%%WWWDIR%%/js/chunks/contacts.83.db056bbfee0ffbd06351.js
>-%%WWWDIR%%/js/chunks/contacts.83.db056bbfee0ffbd06351.js.map
>-%%WWWDIR%%/js/chunks/contacts.84.782f5d06e7e903371a32.js
>-%%WWWDIR%%/js/chunks/contacts.84.782f5d06e7e903371a32.js.map
>-%%WWWDIR%%/js/chunks/contacts.85.95ca3ef1bf97814c8b6a.js
>-%%WWWDIR%%/js/chunks/contacts.85.95ca3ef1bf97814c8b6a.js.map
>-%%WWWDIR%%/js/chunks/contacts.86.39fd54bb729e3e19d559.js
>-%%WWWDIR%%/js/chunks/contacts.86.39fd54bb729e3e19d559.js.map
>-%%WWWDIR%%/js/chunks/contacts.87.ff6d98a7e7d0a6c6b19c.js
>-%%WWWDIR%%/js/chunks/contacts.87.ff6d98a7e7d0a6c6b19c.js.map
>-%%WWWDIR%%/js/chunks/contacts.88.a0fa04e19465ea5d3067.js
>-%%WWWDIR%%/js/chunks/contacts.88.a0fa04e19465ea5d3067.js.map
>-%%WWWDIR%%/js/chunks/contacts.89.4915c03526dc55635bab.js
>-%%WWWDIR%%/js/chunks/contacts.89.4915c03526dc55635bab.js.map
>-%%WWWDIR%%/js/chunks/contacts.9.26e93a44b3448e6b0662.js
>-%%WWWDIR%%/js/chunks/contacts.9.26e93a44b3448e6b0662.js.map
>-%%WWWDIR%%/js/chunks/contacts.90.a31bc53890214c0df54d.js
>-%%WWWDIR%%/js/chunks/contacts.90.a31bc53890214c0df54d.js.map
>-%%WWWDIR%%/js/chunks/contacts.91.8e4379376bb2f55e5ad0.js
>-%%WWWDIR%%/js/chunks/contacts.91.8e4379376bb2f55e5ad0.js.map
>-%%WWWDIR%%/js/chunks/contacts.92.af3d4391ad3c7d9154e8.js
>-%%WWWDIR%%/js/chunks/contacts.92.af3d4391ad3c7d9154e8.js.map
>-%%WWWDIR%%/js/chunks/contacts.93.ee999b5ab15d0f5b1ed4.js
>-%%WWWDIR%%/js/chunks/contacts.93.ee999b5ab15d0f5b1ed4.js.map
>-%%WWWDIR%%/js/chunks/contacts.94.5510732c70b35d377aad.js
>-%%WWWDIR%%/js/chunks/contacts.94.5510732c70b35d377aad.js.map
>-%%WWWDIR%%/js/chunks/contacts.95.1ed79a69d67a61348317.js
>-%%WWWDIR%%/js/chunks/contacts.95.1ed79a69d67a61348317.js.map
>-%%WWWDIR%%/js/chunks/contacts.96.658f73445582a4d497db.js
>-%%WWWDIR%%/js/chunks/contacts.96.658f73445582a4d497db.js.map
>-%%WWWDIR%%/js/chunks/contacts.97.996322200a5916f85c56.js
>-%%WWWDIR%%/js/chunks/contacts.97.996322200a5916f85c56.js.map
>-%%WWWDIR%%/js/chunks/contacts.98.235d2dec48c89b2b6c4a.js
>-%%WWWDIR%%/js/chunks/contacts.98.235d2dec48c89b2b6c4a.js.map
>-%%WWWDIR%%/js/chunks/contacts.99.636d81f8c74d9c0051e4.js
>-%%WWWDIR%%/js/chunks/contacts.99.636d81f8c74d9c0051e4.js.map
>+%%WWWDIR%%/js/chunks/0.js
>+%%WWWDIR%%/js/chunks/0.js.map
>+%%WWWDIR%%/js/chunks/1.js
>+%%WWWDIR%%/js/chunks/1.js.map
>+%%WWWDIR%%/js/chunks/10.js
>+%%WWWDIR%%/js/chunks/10.js.map
>+%%WWWDIR%%/js/chunks/100.js
>+%%WWWDIR%%/js/chunks/100.js.map
>+%%WWWDIR%%/js/chunks/101.js
>+%%WWWDIR%%/js/chunks/101.js.map
>+%%WWWDIR%%/js/chunks/102.js
>+%%WWWDIR%%/js/chunks/102.js.map
>+%%WWWDIR%%/js/chunks/103.js
>+%%WWWDIR%%/js/chunks/103.js.map
>+%%WWWDIR%%/js/chunks/104.js
>+%%WWWDIR%%/js/chunks/104.js.map
>+%%WWWDIR%%/js/chunks/105.js
>+%%WWWDIR%%/js/chunks/105.js.map
>+%%WWWDIR%%/js/chunks/106.js
>+%%WWWDIR%%/js/chunks/106.js.map
>+%%WWWDIR%%/js/chunks/107.js
>+%%WWWDIR%%/js/chunks/107.js.map
>+%%WWWDIR%%/js/chunks/108.js
>+%%WWWDIR%%/js/chunks/108.js.map
>+%%WWWDIR%%/js/chunks/109.js
>+%%WWWDIR%%/js/chunks/109.js.map
>+%%WWWDIR%%/js/chunks/11.js
>+%%WWWDIR%%/js/chunks/11.js.map
>+%%WWWDIR%%/js/chunks/110.js
>+%%WWWDIR%%/js/chunks/110.js.map
>+%%WWWDIR%%/js/chunks/111.js
>+%%WWWDIR%%/js/chunks/111.js.map
>+%%WWWDIR%%/js/chunks/112.js
>+%%WWWDIR%%/js/chunks/112.js.map
>+%%WWWDIR%%/js/chunks/113.js
>+%%WWWDIR%%/js/chunks/113.js.map
>+%%WWWDIR%%/js/chunks/114.js
>+%%WWWDIR%%/js/chunks/114.js.map
>+%%WWWDIR%%/js/chunks/115.js
>+%%WWWDIR%%/js/chunks/115.js.map
>+%%WWWDIR%%/js/chunks/116.js
>+%%WWWDIR%%/js/chunks/116.js.map
>+%%WWWDIR%%/js/chunks/117.js
>+%%WWWDIR%%/js/chunks/117.js.map
>+%%WWWDIR%%/js/chunks/118.js
>+%%WWWDIR%%/js/chunks/118.js.map
>+%%WWWDIR%%/js/chunks/119.js
>+%%WWWDIR%%/js/chunks/119.js.map
>+%%WWWDIR%%/js/chunks/12.js
>+%%WWWDIR%%/js/chunks/12.js.map
>+%%WWWDIR%%/js/chunks/120.js
>+%%WWWDIR%%/js/chunks/120.js.map
>+%%WWWDIR%%/js/chunks/121.js
>+%%WWWDIR%%/js/chunks/121.js.map
>+%%WWWDIR%%/js/chunks/122.js
>+%%WWWDIR%%/js/chunks/122.js.map
>+%%WWWDIR%%/js/chunks/123.js
>+%%WWWDIR%%/js/chunks/123.js.map
>+%%WWWDIR%%/js/chunks/124.js
>+%%WWWDIR%%/js/chunks/124.js.map
>+%%WWWDIR%%/js/chunks/125.js
>+%%WWWDIR%%/js/chunks/125.js.map
>+%%WWWDIR%%/js/chunks/126.js
>+%%WWWDIR%%/js/chunks/126.js.map
>+%%WWWDIR%%/js/chunks/13.js
>+%%WWWDIR%%/js/chunks/13.js.map
>+%%WWWDIR%%/js/chunks/14.js
>+%%WWWDIR%%/js/chunks/14.js.map
>+%%WWWDIR%%/js/chunks/15.js
>+%%WWWDIR%%/js/chunks/15.js.map
>+%%WWWDIR%%/js/chunks/16.js
>+%%WWWDIR%%/js/chunks/16.js.map
>+%%WWWDIR%%/js/chunks/17.js
>+%%WWWDIR%%/js/chunks/17.js.map
>+%%WWWDIR%%/js/chunks/18.js
>+%%WWWDIR%%/js/chunks/18.js.map
>+%%WWWDIR%%/js/chunks/19.js
>+%%WWWDIR%%/js/chunks/19.js.map
>+%%WWWDIR%%/js/chunks/2.js
>+%%WWWDIR%%/js/chunks/2.js.map
>+%%WWWDIR%%/js/chunks/20.js
>+%%WWWDIR%%/js/chunks/20.js.map
>+%%WWWDIR%%/js/chunks/21.js
>+%%WWWDIR%%/js/chunks/21.js.map
>+%%WWWDIR%%/js/chunks/22.js
>+%%WWWDIR%%/js/chunks/22.js.map
>+%%WWWDIR%%/js/chunks/23.js
>+%%WWWDIR%%/js/chunks/23.js.map
>+%%WWWDIR%%/js/chunks/24.js
>+%%WWWDIR%%/js/chunks/24.js.map
>+%%WWWDIR%%/js/chunks/25.js
>+%%WWWDIR%%/js/chunks/25.js.map
>+%%WWWDIR%%/js/chunks/26.js
>+%%WWWDIR%%/js/chunks/26.js.map
>+%%WWWDIR%%/js/chunks/27.js
>+%%WWWDIR%%/js/chunks/27.js.map
>+%%WWWDIR%%/js/chunks/28.js
>+%%WWWDIR%%/js/chunks/28.js.map
>+%%WWWDIR%%/js/chunks/29.js
>+%%WWWDIR%%/js/chunks/29.js.map
>+%%WWWDIR%%/js/chunks/3.js
>+%%WWWDIR%%/js/chunks/3.js.map
>+%%WWWDIR%%/js/chunks/30.js
>+%%WWWDIR%%/js/chunks/30.js.map
>+%%WWWDIR%%/js/chunks/31.js
>+%%WWWDIR%%/js/chunks/31.js.map
>+%%WWWDIR%%/js/chunks/32.js
>+%%WWWDIR%%/js/chunks/32.js.map
>+%%WWWDIR%%/js/chunks/33.js
>+%%WWWDIR%%/js/chunks/33.js.map
>+%%WWWDIR%%/js/chunks/34.js
>+%%WWWDIR%%/js/chunks/34.js.map
>+%%WWWDIR%%/js/chunks/35.js
>+%%WWWDIR%%/js/chunks/35.js.map
>+%%WWWDIR%%/js/chunks/36.js
>+%%WWWDIR%%/js/chunks/36.js.map
>+%%WWWDIR%%/js/chunks/37.js
>+%%WWWDIR%%/js/chunks/37.js.map
>+%%WWWDIR%%/js/chunks/38.js
>+%%WWWDIR%%/js/chunks/38.js.map
>+%%WWWDIR%%/js/chunks/39.js
>+%%WWWDIR%%/js/chunks/39.js.map
>+%%WWWDIR%%/js/chunks/4.js
>+%%WWWDIR%%/js/chunks/4.js.map
>+%%WWWDIR%%/js/chunks/40.js
>+%%WWWDIR%%/js/chunks/40.js.map
>+%%WWWDIR%%/js/chunks/41.js
>+%%WWWDIR%%/js/chunks/41.js.map
>+%%WWWDIR%%/js/chunks/42.js
>+%%WWWDIR%%/js/chunks/42.js.map
>+%%WWWDIR%%/js/chunks/43.js
>+%%WWWDIR%%/js/chunks/43.js.map
>+%%WWWDIR%%/js/chunks/44.js
>+%%WWWDIR%%/js/chunks/44.js.map
>+%%WWWDIR%%/js/chunks/45.js
>+%%WWWDIR%%/js/chunks/45.js.map
>+%%WWWDIR%%/js/chunks/46.js
>+%%WWWDIR%%/js/chunks/46.js.map
>+%%WWWDIR%%/js/chunks/47.js
>+%%WWWDIR%%/js/chunks/47.js.map
>+%%WWWDIR%%/js/chunks/48.js
>+%%WWWDIR%%/js/chunks/48.js.map
>+%%WWWDIR%%/js/chunks/49.js
>+%%WWWDIR%%/js/chunks/49.js.map
>+%%WWWDIR%%/js/chunks/5.js
>+%%WWWDIR%%/js/chunks/5.js.map
>+%%WWWDIR%%/js/chunks/50.js
>+%%WWWDIR%%/js/chunks/50.js.map
>+%%WWWDIR%%/js/chunks/51.js
>+%%WWWDIR%%/js/chunks/51.js.map
>+%%WWWDIR%%/js/chunks/52.js
>+%%WWWDIR%%/js/chunks/52.js.map
>+%%WWWDIR%%/js/chunks/53.js
>+%%WWWDIR%%/js/chunks/53.js.map
>+%%WWWDIR%%/js/chunks/54.js
>+%%WWWDIR%%/js/chunks/54.js.map
>+%%WWWDIR%%/js/chunks/55.js
>+%%WWWDIR%%/js/chunks/55.js.map
>+%%WWWDIR%%/js/chunks/56.js
>+%%WWWDIR%%/js/chunks/56.js.map
>+%%WWWDIR%%/js/chunks/57.js
>+%%WWWDIR%%/js/chunks/57.js.map
>+%%WWWDIR%%/js/chunks/58.js
>+%%WWWDIR%%/js/chunks/58.js.map
>+%%WWWDIR%%/js/chunks/59.js
>+%%WWWDIR%%/js/chunks/59.js.map
>+%%WWWDIR%%/js/chunks/6.js
>+%%WWWDIR%%/js/chunks/6.js.map
>+%%WWWDIR%%/js/chunks/60.js
>+%%WWWDIR%%/js/chunks/60.js.map
>+%%WWWDIR%%/js/chunks/61.js
>+%%WWWDIR%%/js/chunks/61.js.map
>+%%WWWDIR%%/js/chunks/62.js
>+%%WWWDIR%%/js/chunks/62.js.map
>+%%WWWDIR%%/js/chunks/63.js
>+%%WWWDIR%%/js/chunks/63.js.map
>+%%WWWDIR%%/js/chunks/64.js
>+%%WWWDIR%%/js/chunks/64.js.map
>+%%WWWDIR%%/js/chunks/65.js
>+%%WWWDIR%%/js/chunks/65.js.map
>+%%WWWDIR%%/js/chunks/66.js
>+%%WWWDIR%%/js/chunks/66.js.map
>+%%WWWDIR%%/js/chunks/67.js
>+%%WWWDIR%%/js/chunks/67.js.map
>+%%WWWDIR%%/js/chunks/68.js
>+%%WWWDIR%%/js/chunks/68.js.map
>+%%WWWDIR%%/js/chunks/69.js
>+%%WWWDIR%%/js/chunks/69.js.map
>+%%WWWDIR%%/js/chunks/7.js
>+%%WWWDIR%%/js/chunks/7.js.map
>+%%WWWDIR%%/js/chunks/70.js
>+%%WWWDIR%%/js/chunks/70.js.map
>+%%WWWDIR%%/js/chunks/71.js
>+%%WWWDIR%%/js/chunks/71.js.map
>+%%WWWDIR%%/js/chunks/72.js
>+%%WWWDIR%%/js/chunks/72.js.map
>+%%WWWDIR%%/js/chunks/73.js
>+%%WWWDIR%%/js/chunks/73.js.map
>+%%WWWDIR%%/js/chunks/74.js
>+%%WWWDIR%%/js/chunks/74.js.map
>+%%WWWDIR%%/js/chunks/75.js
>+%%WWWDIR%%/js/chunks/75.js.map
>+%%WWWDIR%%/js/chunks/76.js
>+%%WWWDIR%%/js/chunks/76.js.map
>+%%WWWDIR%%/js/chunks/77.js
>+%%WWWDIR%%/js/chunks/77.js.map
>+%%WWWDIR%%/js/chunks/78.js
>+%%WWWDIR%%/js/chunks/78.js.map
>+%%WWWDIR%%/js/chunks/79.js
>+%%WWWDIR%%/js/chunks/79.js.map
>+%%WWWDIR%%/js/chunks/8.js
>+%%WWWDIR%%/js/chunks/8.js.map
>+%%WWWDIR%%/js/chunks/80.js
>+%%WWWDIR%%/js/chunks/80.js.map
>+%%WWWDIR%%/js/chunks/81.js
>+%%WWWDIR%%/js/chunks/81.js.map
>+%%WWWDIR%%/js/chunks/82.js
>+%%WWWDIR%%/js/chunks/82.js.map
>+%%WWWDIR%%/js/chunks/83.js
>+%%WWWDIR%%/js/chunks/83.js.map
>+%%WWWDIR%%/js/chunks/84.js
>+%%WWWDIR%%/js/chunks/84.js.map
>+%%WWWDIR%%/js/chunks/85.js
>+%%WWWDIR%%/js/chunks/85.js.map
>+%%WWWDIR%%/js/chunks/86.js
>+%%WWWDIR%%/js/chunks/86.js.map
>+%%WWWDIR%%/js/chunks/87.js
>+%%WWWDIR%%/js/chunks/87.js.map
>+%%WWWDIR%%/js/chunks/88.js
>+%%WWWDIR%%/js/chunks/88.js.map
>+%%WWWDIR%%/js/chunks/89.js
>+%%WWWDIR%%/js/chunks/89.js.map
>+%%WWWDIR%%/js/chunks/9.js
>+%%WWWDIR%%/js/chunks/9.js.map
>+%%WWWDIR%%/js/chunks/90.js
>+%%WWWDIR%%/js/chunks/90.js.map
>+%%WWWDIR%%/js/chunks/91.js
>+%%WWWDIR%%/js/chunks/91.js.map
>+%%WWWDIR%%/js/chunks/92.js
>+%%WWWDIR%%/js/chunks/92.js.map
>+%%WWWDIR%%/js/chunks/93.js
>+%%WWWDIR%%/js/chunks/93.js.map
>+%%WWWDIR%%/js/chunks/94.js
>+%%WWWDIR%%/js/chunks/94.js.map
>+%%WWWDIR%%/js/chunks/95.js
>+%%WWWDIR%%/js/chunks/95.js.map
>+%%WWWDIR%%/js/chunks/96.js
>+%%WWWDIR%%/js/chunks/96.js.map
>+%%WWWDIR%%/js/chunks/97.js
>+%%WWWDIR%%/js/chunks/97.js.map
>+%%WWWDIR%%/js/chunks/98.js
>+%%WWWDIR%%/js/chunks/98.js.map
>+%%WWWDIR%%/js/chunks/99.js
>+%%WWWDIR%%/js/chunks/99.js.map
>+%%WWWDIR%%/js/chunks/128.js
>+%%WWWDIR%%/js/chunks/128.js.map
> %%WWWDIR%%/js/contacts.js
> %%WWWDIR%%/js/contacts.js.map
> %%WWWDIR%%/l10n/.gitkeep
>diff --git a/www/nextcloud-notes/Makefile b/www/nextcloud-notes/Makefile
>index 8f712935368f..0baa1008f7b2 100644
>--- a/www/nextcloud-notes/Makefile
>+++ b/www/nextcloud-notes/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	notes
>-PORTVERSION=	3.0.0
>+PORTVERSION=	2.6.0
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> MASTER_SITES=	https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/
>@@ -17,7 +17,7 @@ COMMENT=	Notes app for Nextcloud
> LICENSE=	AGPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=15:www/nextcloud@${PHP_FLAVOR}
>+RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=13:www/nextcloud@${PHP_FLAVOR}
> 
> USES=		php:flavors
> NO_BUILD=	yes
>diff --git a/www/nextcloud-notes/distinfo b/www/nextcloud-notes/distinfo
>index 5a8c6ded8054..44b762ab49c0 100644
>--- a/www/nextcloud-notes/distinfo
>+++ b/www/nextcloud-notes/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562411047
>-SHA256 (nextcloud/notes-v3.0.0/notes.tar.gz) = 8dd54d7f812c8fbd5996484296e93b2b1deeeec35a89d5cdb697c322654da444
>-SIZE (nextcloud/notes-v3.0.0/notes.tar.gz) = 389732
>+TIMESTAMP = 1556203584
>+SHA256 (nextcloud/notes-v2.6.0/notes.tar.gz) = 84858039a7bf133d5cdf09a99eaaa60c5eae33cb8fbf7a68d7b7924d2f623bac
>+SIZE (nextcloud/notes-v2.6.0/notes.tar.gz) = 1425724
>diff --git a/www/nextcloud-notes/pkg-plist b/www/nextcloud-notes/pkg-plist
>index 8b8a50b18765..7ef3e05a4fe6 100644
>--- a/www/nextcloud-notes/pkg-plist
>+++ b/www/nextcloud-notes/pkg-plist
>@@ -1,4 +1,4 @@
>-%%WWWDIR%%/CHANGELOG.md
>+%%WWWDIR%%/AUTHORS
> %%WWWDIR%%/COPYING
> %%WWWDIR%%/README.md
> %%WWWDIR%%/appinfo/app.php
>@@ -6,7 +6,6 @@
> %%WWWDIR%%/appinfo/info.xml
> %%WWWDIR%%/appinfo/routes.php
> %%WWWDIR%%/appinfo/signature.json
>-%%WWWDIR%%/css/app-navigation.scss
> %%WWWDIR%%/css/notes.scss
> %%WWWDIR%%/img/favicon-mask.svg
> %%WWWDIR%%/img/favicon-touch.png
>@@ -16,28 +15,143 @@
> %%WWWDIR%%/img/favicon.svg
> %%WWWDIR%%/img/folder-empty.svg
> %%WWWDIR%%/img/folder.svg
>+%%WWWDIR%%/img/loading.gif
> %%WWWDIR%%/img/notes.svg
> %%WWWDIR%%/img/recent.svg
>-%%WWWDIR%%/js/notes.js
>+%%WWWDIR%%/img/search.svg
>+%%WWWDIR%%/js/.bowerrc
>+%%WWWDIR%%/js/.jshintrc
>+%%WWWDIR%%/js/README.md
>+%%WWWDIR%%/js/app/controllers/appcontroller.js
>+%%WWWDIR%%/js/app/controllers/notecontroller.js
>+%%WWWDIR%%/js/app/controllers/notescontroller.js
>+%%WWWDIR%%/js/app/controllers/notessettingscontroller.js
>+%%WWWDIR%%/js/app/directives/autofocus.js
>+%%WWWDIR%%/js/app/directives/editor.js
>+%%WWWDIR%%/js/app/directives/tooltip.js
>+%%WWWDIR%%/js/app/filters/and.js
>+%%WWWDIR%%/js/app/filters/categoryTitle.js
>+%%WWWDIR%%/js/app/filters/groupNotes.js
>+%%WWWDIR%%/js/app/filters/wordCount.js
>+%%WWWDIR%%/js/app/services/debounce.js
>+%%WWWDIR%%/js/app/services/is.js
>+%%WWWDIR%%/js/app/services/notesmodel.js
>+%%WWWDIR%%/js/app/services/savequeue.js
>+%%WWWDIR%%/js/app/services/urlFinder.js
>+%%WWWDIR%%/js/config/app.js
>+%%WWWDIR%%/js/public/app.min.js
>+%%WWWDIR%%/js/public/app.min.js.map
>+%%WWWDIR%%/js/vendor/angular-route/.bower.json
>+%%WWWDIR%%/js/vendor/angular-route/LICENSE.md
>+%%WWWDIR%%/js/vendor/angular-route/README.md
>+%%WWWDIR%%/js/vendor/angular-route/angular-route.js
>+%%WWWDIR%%/js/vendor/angular-route/angular-route.min.js
>+%%WWWDIR%%/js/vendor/angular-route/angular-route.min.js.map
>+%%WWWDIR%%/js/vendor/angular-route/bower.json
>+%%WWWDIR%%/js/vendor/angular-route/index.js
>+%%WWWDIR%%/js/vendor/angular-route/package.json
>+%%WWWDIR%%/js/vendor/angular/.bower.json
>+%%WWWDIR%%/js/vendor/angular/LICENSE.md
>+%%WWWDIR%%/js/vendor/angular/README.md
>+%%WWWDIR%%/js/vendor/angular/angular-csp.css
>+%%WWWDIR%%/js/vendor/angular/angular.js
>+%%WWWDIR%%/js/vendor/angular/angular.min.js
>+%%WWWDIR%%/js/vendor/angular/angular.min.js.gzip
>+%%WWWDIR%%/js/vendor/angular/angular.min.js.map
>+%%WWWDIR%%/js/vendor/angular/bower.json
>+%%WWWDIR%%/js/vendor/angular/index.js
>+%%WWWDIR%%/js/vendor/angular/package.json
>+%%WWWDIR%%/js/vendor/restangular/.bower.json
>+%%WWWDIR%%/js/vendor/restangular/.editorconfig
>+%%WWWDIR%%/js/vendor/restangular/.github/ISSUE_TEMPLATE.md
>+%%WWWDIR%%/js/vendor/restangular/.jshintrc
>+%%WWWDIR%%/js/vendor/restangular/CHANGELOG.md
>+%%WWWDIR%%/js/vendor/restangular/Gruntfile.js
>+%%WWWDIR%%/js/vendor/restangular/README.md
>+%%WWWDIR%%/js/vendor/restangular/bower.json
>+%%WWWDIR%%/js/vendor/restangular/dist/restangular.js
>+%%WWWDIR%%/js/vendor/restangular/dist/restangular.min.js
>+%%WWWDIR%%/js/vendor/restangular/dist/restangular.zip
>+%%WWWDIR%%/js/vendor/restangular/karma.conf.js
>+%%WWWDIR%%/js/vendor/restangular/karma.underscore.conf.js
>+%%WWWDIR%%/js/vendor/restangular/license.md
>+%%WWWDIR%%/js/vendor/restangular/package.json
>+%%WWWDIR%%/js/vendor/restangular/src/restangular.js
>+%%WWWDIR%%/js/vendor/simplemde/.bower.json
>+%%WWWDIR%%/js/vendor/simplemde/LICENSE
>+%%WWWDIR%%/js/vendor/simplemde/README.md
>+%%WWWDIR%%/js/vendor/simplemde/bower.json
>+%%WWWDIR%%/js/vendor/simplemde/debug/simplemde.css
>+%%WWWDIR%%/js/vendor/simplemde/debug/simplemde.debug.js
>+%%WWWDIR%%/js/vendor/simplemde/debug/simplemde.js
>+%%WWWDIR%%/js/vendor/simplemde/dist/simplemde.min.css
>+%%WWWDIR%%/js/vendor/simplemde/dist/simplemde.min.js
>+%%WWWDIR%%/js/vendor/simplemde/gulpfile.js
>+%%WWWDIR%%/js/vendor/simplemde/package.json
>+%%WWWDIR%%/js/vendor/simplemde/src/css/simplemde.css
>+%%WWWDIR%%/js/vendor/simplemde/src/js/codemirror/tablist.js
>+%%WWWDIR%%/js/vendor/simplemde/src/js/simplemde.js
> %%WWWDIR%%/l10n/.gitkeep
> %%WWWDIR%%/l10n/af.js
> %%WWWDIR%%/l10n/af.json
>+%%WWWDIR%%/l10n/ar.js
>+%%WWWDIR%%/l10n/ar.json
> %%WWWDIR%%/l10n/bg.js
> %%WWWDIR%%/l10n/bg.json
> %%WWWDIR%%/l10n/ca.js
> %%WWWDIR%%/l10n/ca.json
> %%WWWDIR%%/l10n/cs.js
> %%WWWDIR%%/l10n/cs.json
>+%%WWWDIR%%/l10n/da.js
>+%%WWWDIR%%/l10n/da.json
> %%WWWDIR%%/l10n/de.js
> %%WWWDIR%%/l10n/de.json
> %%WWWDIR%%/l10n/de_DE.js
> %%WWWDIR%%/l10n/de_DE.json
> %%WWWDIR%%/l10n/el.js
> %%WWWDIR%%/l10n/el.json
>+%%WWWDIR%%/l10n/en_GB.js
>+%%WWWDIR%%/l10n/en_GB.json
> %%WWWDIR%%/l10n/eo.js
> %%WWWDIR%%/l10n/eo.json
> %%WWWDIR%%/l10n/es.js
> %%WWWDIR%%/l10n/es.json
>+%%WWWDIR%%/l10n/es_419.js
>+%%WWWDIR%%/l10n/es_419.json
>+%%WWWDIR%%/l10n/es_CL.js
>+%%WWWDIR%%/l10n/es_CL.json
>+%%WWWDIR%%/l10n/es_CO.js
>+%%WWWDIR%%/l10n/es_CO.json
>+%%WWWDIR%%/l10n/es_CR.js
>+%%WWWDIR%%/l10n/es_CR.json
>+%%WWWDIR%%/l10n/es_DO.js
>+%%WWWDIR%%/l10n/es_DO.json
>+%%WWWDIR%%/l10n/es_EC.js
>+%%WWWDIR%%/l10n/es_EC.json
>+%%WWWDIR%%/l10n/es_GT.js
>+%%WWWDIR%%/l10n/es_GT.json
>+%%WWWDIR%%/l10n/es_HN.js
>+%%WWWDIR%%/l10n/es_HN.json
>+%%WWWDIR%%/l10n/es_MX.js
>+%%WWWDIR%%/l10n/es_MX.json
>+%%WWWDIR%%/l10n/es_NI.js
>+%%WWWDIR%%/l10n/es_NI.json
>+%%WWWDIR%%/l10n/es_PA.js
>+%%WWWDIR%%/l10n/es_PA.json
>+%%WWWDIR%%/l10n/es_PE.js
>+%%WWWDIR%%/l10n/es_PE.json
>+%%WWWDIR%%/l10n/es_PR.js
>+%%WWWDIR%%/l10n/es_PR.json
>+%%WWWDIR%%/l10n/es_PY.js
>+%%WWWDIR%%/l10n/es_PY.json
>+%%WWWDIR%%/l10n/es_SV.js
>+%%WWWDIR%%/l10n/es_SV.json
>+%%WWWDIR%%/l10n/es_UY.js
>+%%WWWDIR%%/l10n/es_UY.json
>+%%WWWDIR%%/l10n/eu.js
>+%%WWWDIR%%/l10n/eu.json
>+%%WWWDIR%%/l10n/fi.js
>+%%WWWDIR%%/l10n/fi.json
> %%WWWDIR%%/l10n/fr.js
> %%WWWDIR%%/l10n/fr.json
> %%WWWDIR%%/l10n/gl.js
>@@ -52,6 +166,14 @@
> %%WWWDIR%%/l10n/it.json
> %%WWWDIR%%/l10n/ja.js
> %%WWWDIR%%/l10n/ja.json
>+%%WWWDIR%%/l10n/ka_GE.js
>+%%WWWDIR%%/l10n/ka_GE.json
>+%%WWWDIR%%/l10n/ko.js
>+%%WWWDIR%%/l10n/ko.json
>+%%WWWDIR%%/l10n/lt_LT.js
>+%%WWWDIR%%/l10n/lt_LT.json
>+%%WWWDIR%%/l10n/nb.js
>+%%WWWDIR%%/l10n/nb.json
> %%WWWDIR%%/l10n/nl.js
> %%WWWDIR%%/l10n/nl.json
> %%WWWDIR%%/l10n/pl.js
>@@ -86,3 +208,4 @@
> %%WWWDIR%%/lib/Service/NotesService.php
> %%WWWDIR%%/lib/Service/SettingsService.php
> %%WWWDIR%%/templates/main.php
>+%%WWWDIR%%/templates/note.php
>diff --git a/www/nextcloud-tasks/Makefile b/www/nextcloud-tasks/Makefile
>index 612dd93b00e8..3f2d640b936a 100644
>--- a/www/nextcloud-tasks/Makefile
>+++ b/www/nextcloud-tasks/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	tasks
>-PORTVERSION=	0.11.0
>+PORTVERSION=	0.9.8
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> MASTER_SITES=	https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/
>@@ -17,7 +17,7 @@ COMMENT=	Tasks app for Nextcloud
> LICENSE=	AGPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=15:www/nextcloud@${PHP_FLAVOR}
>+RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=13:www/nextcloud@${PHP_FLAVOR}
> 
> USES=		php:flavors
> NO_BUILD=	yes
>diff --git a/www/nextcloud-tasks/distinfo b/www/nextcloud-tasks/distinfo
>index c36c8469ea93..f3cc639ae8aa 100644
>--- a/www/nextcloud-tasks/distinfo
>+++ b/www/nextcloud-tasks/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562410810
>-SHA256 (nextcloud/tasks-v0.11.0/tasks.tar.gz) = e9ac2fdfab87daf2223f930d136102e9af005eee13f2b0b16d30357cc7890af0
>-SIZE (nextcloud/tasks-v0.11.0/tasks.tar.gz) = 1362096
>+TIMESTAMP = 1543060191
>+SHA256 (nextcloud/tasks-v0.9.8/tasks.tar.gz) = de9a47aafff5e6008046eb3955ae3c0937fb8f4d1d14895d02d3694789083521
>+SIZE (nextcloud/tasks-v0.9.8/tasks.tar.gz) = 390099
>diff --git a/www/nextcloud-tasks/pkg-plist b/www/nextcloud-tasks/pkg-plist
>index 9dd92be86667..ff3667abaddd 100644
>--- a/www/nextcloud-tasks/pkg-plist
>+++ b/www/nextcloud-tasks/pkg-plist
>@@ -1,39 +1,48 @@
>-%%WWWDIR%%/CHANGELOG.md
> %%WWWDIR%%/LICENSE
> %%WWWDIR%%/appinfo/app.php
>+%%WWWDIR%%/appinfo/application.php
> %%WWWDIR%%/appinfo/info.xml
> %%WWWDIR%%/appinfo/routes.php
> %%WWWDIR%%/appinfo/signature.json
>-%%WWWDIR%%/css/src/Calendars/Calendar.scss
>-%%WWWDIR%%/css/src/Calendars/CalendarSharee.scss
>-%%WWWDIR%%/css/src/Calendars/CalendarShares.scss
>-%%WWWDIR%%/css/src/markdown.scss
>-%%WWWDIR%%/css/src/sprites-bw.scss
>-%%WWWDIR%%/css/src/sprites-color.scss
>-%%WWWDIR%%/css/src/style.scss
>-%%WWWDIR%%/css/src/vars.scss
>-%%WWWDIR%%/css/tasks.scss
>+%%WWWDIR%%/css/style.scss
> %%WWWDIR%%/img/arrow-left.svg
> %%WWWDIR%%/img/arrow-right.svg
>-%%WWWDIR%%/img/bw.svg
>-%%WWWDIR%%/img/color.svg
>-%%WWWDIR%%/img/color_picker.svg
> %%WWWDIR%%/img/favicon-touch.png
> %%WWWDIR%%/img/favicon-touch.svg
> %%WWWDIR%%/img/favicon.ico
> %%WWWDIR%%/img/favicon.png
> %%WWWDIR%%/img/favicon.svg
>+%%WWWDIR%%/img/sprites.svg
> %%WWWDIR%%/img/tasks.png
> %%WWWDIR%%/img/tasks.svg
>-%%WWWDIR%%/js/tasks.js
>-%%WWWDIR%%/js/tasks.js.map
>+%%WWWDIR%%/js/merged.json
>+%%WWWDIR%%/js/public/app.min.js
>+%%WWWDIR%%/js/public/app.min.js.map
>+%%WWWDIR%%/js/vendor/angular-animate/angular-animate.min.js
>+%%WWWDIR%%/js/vendor/angular-drag-and-drop-lists/angular-drag-and-drop-lists.min.js
>+%%WWWDIR%%/js/vendor/angular-route/angular-route.min.js
>+%%WWWDIR%%/js/vendor/angular-sanitize/angular-sanitize.min.js
>+%%WWWDIR%%/js/vendor/angular/angular.min.js
>+%%WWWDIR%%/js/vendor/ical.js/build/ical.min.js
>+%%WWWDIR%%/js/vendor/jstimezonedetect/dist/jstz.min.js
>+%%WWWDIR%%/js/vendor/ui-select/dist/select.min.css
>+%%WWWDIR%%/js/vendor/ui-select/dist/select.min.js
>+%%WWWDIR%%/js/vendor_legacy/jquery-timepicker/jquery.ui.timepicker.js
> %%WWWDIR%%/l10n/.gitkeep
> %%WWWDIR%%/l10n/af.js
> %%WWWDIR%%/l10n/af.json
>+%%WWWDIR%%/l10n/ar.js
>+%%WWWDIR%%/l10n/ar.json
> %%WWWDIR%%/l10n/ast.js
> %%WWWDIR%%/l10n/ast.json
>+%%WWWDIR%%/l10n/az.js
>+%%WWWDIR%%/l10n/az.json
> %%WWWDIR%%/l10n/bg.js
> %%WWWDIR%%/l10n/bg.json
>+%%WWWDIR%%/l10n/bn_BD.js
>+%%WWWDIR%%/l10n/bn_BD.json
>+%%WWWDIR%%/l10n/bs.js
>+%%WWWDIR%%/l10n/bs.json
> %%WWWDIR%%/l10n/ca.js
> %%WWWDIR%%/l10n/ca.json
> %%WWWDIR%%/l10n/cs.js
>@@ -90,6 +99,8 @@
> %%WWWDIR%%/l10n/et_EE.json
> %%WWWDIR%%/l10n/eu.js
> %%WWWDIR%%/l10n/eu.json
>+%%WWWDIR%%/l10n/fa.js
>+%%WWWDIR%%/l10n/fa.json
> %%WWWDIR%%/l10n/fi.js
> %%WWWDIR%%/l10n/fi.json
> %%WWWDIR%%/l10n/fr.js
>@@ -98,8 +109,16 @@
> %%WWWDIR%%/l10n/gl.json
> %%WWWDIR%%/l10n/he.js
> %%WWWDIR%%/l10n/he.json
>+%%WWWDIR%%/l10n/hr.js
>+%%WWWDIR%%/l10n/hr.json
> %%WWWDIR%%/l10n/hu.js
> %%WWWDIR%%/l10n/hu.json
>+%%WWWDIR%%/l10n/hy.js
>+%%WWWDIR%%/l10n/hy.json
>+%%WWWDIR%%/l10n/ia.js
>+%%WWWDIR%%/l10n/ia.json
>+%%WWWDIR%%/l10n/id.js
>+%%WWWDIR%%/l10n/id.json
> %%WWWDIR%%/l10n/is.js
> %%WWWDIR%%/l10n/is.json
> %%WWWDIR%%/l10n/it.js
>@@ -110,18 +129,30 @@
> %%WWWDIR%%/l10n/ka_GE.json
> %%WWWDIR%%/l10n/ko.js
> %%WWWDIR%%/l10n/ko.json
>+%%WWWDIR%%/l10n/lb.js
>+%%WWWDIR%%/l10n/lb.json
> %%WWWDIR%%/l10n/lt_LT.js
> %%WWWDIR%%/l10n/lt_LT.json
> %%WWWDIR%%/l10n/lv.js
> %%WWWDIR%%/l10n/lv.json
>+%%WWWDIR%%/l10n/mk.js
>+%%WWWDIR%%/l10n/mk.json
>+%%WWWDIR%%/l10n/mn.js
>+%%WWWDIR%%/l10n/mn.json
> %%WWWDIR%%/l10n/nb.js
> %%WWWDIR%%/l10n/nb.json
> %%WWWDIR%%/l10n/nl.js
> %%WWWDIR%%/l10n/nl.json
>+%%WWWDIR%%/l10n/oc.js
>+%%WWWDIR%%/l10n/oc.json
> %%WWWDIR%%/l10n/pl.js
> %%WWWDIR%%/l10n/pl.json
> %%WWWDIR%%/l10n/pt_BR.js
> %%WWWDIR%%/l10n/pt_BR.json
>+%%WWWDIR%%/l10n/pt_PT.js
>+%%WWWDIR%%/l10n/pt_PT.json
>+%%WWWDIR%%/l10n/ro.js
>+%%WWWDIR%%/l10n/ro.json
> %%WWWDIR%%/l10n/ru.js
> %%WWWDIR%%/l10n/ru.json
> %%WWWDIR%%/l10n/sk.js
>@@ -140,17 +171,25 @@
> %%WWWDIR%%/l10n/tr.json
> %%WWWDIR%%/l10n/uk.js
> %%WWWDIR%%/l10n/uk.json
>+%%WWWDIR%%/l10n/vi.js
>+%%WWWDIR%%/l10n/vi.json
> %%WWWDIR%%/l10n/zh_CN.js
> %%WWWDIR%%/l10n/zh_CN.json
>+%%WWWDIR%%/l10n/zh_HK.js
>+%%WWWDIR%%/l10n/zh_HK.json
> %%WWWDIR%%/l10n/zh_TW.js
> %%WWWDIR%%/l10n/zh_TW.json
>-%%WWWDIR%%/lib/AppInfo/Application.php
> %%WWWDIR%%/lib/Controller/CollectionsController.php
> %%WWWDIR%%/lib/Controller/PageController.php
> %%WWWDIR%%/lib/Controller/Response.php
> %%WWWDIR%%/lib/Controller/SettingsController.php
> %%WWWDIR%%/lib/Service/CollectionsService.php
> %%WWWDIR%%/lib/Service/SettingsService.php
>-%%WWWDIR%%/phpunit.integration.xml
>-%%WWWDIR%%/phpunit.xml
>+%%WWWDIR%%/templates/colorpicker.html
>+%%WWWDIR%%/templates/confirmation.php
> %%WWWDIR%%/templates/main.php
>+%%WWWDIR%%/templates/part.collectionall.php
>+%%WWWDIR%%/templates/part.collectionweek.php
>+%%WWWDIR%%/templates/part.details.php
>+%%WWWDIR%%/templates/part.taskbody.php
>+%%WWWDIR%%/templates/part.tasklist.php
>diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile
>index dee33ef61c0d..730b57b87e94 100644
>--- a/www/nextcloud/Makefile
>+++ b/www/nextcloud/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	nextcloud
>-DISTVERSION=	16.0.2
>+DISTVERSION=	16.0.1
> CATEGORIES=	www
> MASTER_SITES=	https://download.nextcloud.com/server/releases/
> PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
>diff --git a/www/nextcloud/distinfo b/www/nextcloud/distinfo
>index e7ad8f5ab6ea..1aedd59e739a 100644
>--- a/www/nextcloud/distinfo
>+++ b/www/nextcloud/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562410174
>-SHA256 (nextcloud-16.0.2.tar.bz2) = f69db6d6961c1b2552990f742877037a8698753ecf27b457b012194d97463641
>-SIZE (nextcloud-16.0.2.tar.bz2) = 61600732
>+TIMESTAMP = 1558011986
>+SHA256 (nextcloud-16.0.1.tar.bz2) = a80ce586e9e930b2fba69707311e575346cd4dc4402e84678c730f9930d78aee
>+SIZE (nextcloud-16.0.1.tar.bz2) = 102865395
>diff --git a/www/nextcloud/files/pkg-message.in b/www/nextcloud/files/pkg-message.in
>index b875627d618d..368a2cf15637 100644
>--- a/www/nextcloud/files/pkg-message.in
>+++ b/www/nextcloud/files/pkg-message.in
>@@ -27,7 +27,7 @@ options are available in
> You can find annotated configuration options in config.documented.php
> in the same directory. Nextcloud's configuration documentation is at 
> 
>-	https://docs.nextcloud.com/server/16/admin_manual/configuration_server
>+	https://docs.nextcloud.com/server/14/admin_manual/configuration_server
> 
> The caching options require additional Nextcloud configuration.
> 
>diff --git a/www/nextcloud/pkg-plist b/www/nextcloud/pkg-plist
>index acf2c30b93e8..3b8968235995 100644
>--- a/www/nextcloud/pkg-plist
>+++ b/www/nextcloud/pkg-plist
>@@ -3837,8 +3837,6 @@
> %%WWWDIR%%/apps-pkg/accessibility/js/accessibility.js.map
> %%WWWDIR%%/apps-pkg/accessibility/l10n/af.js
> %%WWWDIR%%/apps-pkg/accessibility/l10n/af.json
>-%%WWWDIR%%/apps-pkg/accessibility/l10n/bg.js
>-%%WWWDIR%%/apps-pkg/accessibility/l10n/bg.json
> %%WWWDIR%%/apps-pkg/accessibility/l10n/ca.js
> %%WWWDIR%%/apps-pkg/accessibility/l10n/ca.json
> %%WWWDIR%%/apps-pkg/accessibility/l10n/cs.js
>@@ -3859,8 +3857,6 @@
> %%WWWDIR%%/apps-pkg/accessibility/l10n/es_AR.json
> %%WWWDIR%%/apps-pkg/accessibility/l10n/eu.js
> %%WWWDIR%%/apps-pkg/accessibility/l10n/eu.json
>-%%WWWDIR%%/apps-pkg/accessibility/l10n/fa.js
>-%%WWWDIR%%/apps-pkg/accessibility/l10n/fa.json
> %%WWWDIR%%/apps-pkg/accessibility/l10n/fi.js
> %%WWWDIR%%/apps-pkg/accessibility/l10n/fi.json
> %%WWWDIR%%/apps-pkg/accessibility/l10n/fo.js
>@@ -4603,7 +4599,6 @@
> %%WWWDIR%%/apps-pkg/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php
> %%WWWDIR%%/apps-pkg/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php
> %%WWWDIR%%/apps-pkg/dav/lib/BackgroundJob/RefreshWebcalJob.php
>-%%WWWDIR%%/apps-pkg/dav/lib/BackgroundJob/RegisterRegenerateBirthdayCalendars.php
> %%WWWDIR%%/apps-pkg/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php
> %%WWWDIR%%/apps-pkg/dav/lib/BackgroundJob/UploadCleanup.php
> %%WWWDIR%%/apps-pkg/dav/lib/CalDAV/Activity/Backend.php
>@@ -6578,14 +6573,10 @@
> %%WWWDIR%%/apps-pkg/files_rightclick/l10n/is.json
> %%WWWDIR%%/apps-pkg/files_rightclick/l10n/it.js
> %%WWWDIR%%/apps-pkg/files_rightclick/l10n/it.json
>-%%WWWDIR%%/apps-pkg/files_rightclick/l10n/ja.js
>-%%WWWDIR%%/apps-pkg/files_rightclick/l10n/ja.json
> %%WWWDIR%%/apps-pkg/files_rightclick/l10n/ko.js
> %%WWWDIR%%/apps-pkg/files_rightclick/l10n/ko.json
> %%WWWDIR%%/apps-pkg/files_rightclick/l10n/lt_LT.js
> %%WWWDIR%%/apps-pkg/files_rightclick/l10n/lt_LT.json
>-%%WWWDIR%%/apps-pkg/files_rightclick/l10n/lv.js
>-%%WWWDIR%%/apps-pkg/files_rightclick/l10n/lv.json
> %%WWWDIR%%/apps-pkg/files_rightclick/l10n/nb.js
> %%WWWDIR%%/apps-pkg/files_rightclick/l10n/nb.json
> %%WWWDIR%%/apps-pkg/files_rightclick/l10n/nl.js
>@@ -6635,6 +6626,7 @@
> %%WWWDIR%%/apps-pkg/files_sharing/css/sharedfilelist.css
> %%WWWDIR%%/apps-pkg/files_sharing/img/app.svg
> %%WWWDIR%%/apps-pkg/files_sharing/js/additionalScripts.js
>+%%WWWDIR%%/apps-pkg/files_sharing/js/additionalScripts.js.map
> %%WWWDIR%%/apps-pkg/files_sharing/js/app.js
> %%WWWDIR%%/apps-pkg/files_sharing/js/dist/additionalScripts.js
> %%WWWDIR%%/apps-pkg/files_sharing/js/dist/additionalScripts.js.map
>@@ -9022,8 +9014,6 @@
> %%WWWDIR%%/apps-pkg/recommendations/l10n/it.json
> %%WWWDIR%%/apps-pkg/recommendations/l10n/ja.js
> %%WWWDIR%%/apps-pkg/recommendations/l10n/ja.json
>-%%WWWDIR%%/apps-pkg/recommendations/l10n/ko.js
>-%%WWWDIR%%/apps-pkg/recommendations/l10n/ko.json
> %%WWWDIR%%/apps-pkg/recommendations/l10n/lt_LT.js
> %%WWWDIR%%/apps-pkg/recommendations/l10n/lt_LT.json
> %%WWWDIR%%/apps-pkg/recommendations/l10n/nb.js
>@@ -9032,12 +9022,8 @@
> %%WWWDIR%%/apps-pkg/recommendations/l10n/nl.json
> %%WWWDIR%%/apps-pkg/recommendations/l10n/pl.js
> %%WWWDIR%%/apps-pkg/recommendations/l10n/pl.json
>-%%WWWDIR%%/apps-pkg/recommendations/l10n/ps.js
>-%%WWWDIR%%/apps-pkg/recommendations/l10n/ps.json
> %%WWWDIR%%/apps-pkg/recommendations/l10n/pt_BR.js
> %%WWWDIR%%/apps-pkg/recommendations/l10n/pt_BR.json
>-%%WWWDIR%%/apps-pkg/recommendations/l10n/pt_PT.js
>-%%WWWDIR%%/apps-pkg/recommendations/l10n/pt_PT.json
> %%WWWDIR%%/apps-pkg/recommendations/l10n/ru.js
> %%WWWDIR%%/apps-pkg/recommendations/l10n/ru.json
> %%WWWDIR%%/apps-pkg/recommendations/l10n/sk.js
>@@ -10660,6 +10646,38 @@
> %%WWWDIR%%/apps-pkg/viewer/appinfo/app.php
> %%WWWDIR%%/apps-pkg/viewer/appinfo/info.xml
> %%WWWDIR%%/apps-pkg/viewer/appinfo/signature.json
>+%%WWWDIR%%/apps-pkg/viewer/cypress.json
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/image-small.png
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/image.bmp
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/image.gif
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/image.png
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/image.svg
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/image1.jpg
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/image2.jpg
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/image3.jpg
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/image4.jpg
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/video.mkv
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/video.ogv
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/video.webm
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/video1.mp4
>+%%WWWDIR%%/apps-pkg/viewer/cypress/fixtures/video2.mp4
>+%%WWWDIR%%/apps-pkg/viewer/cypress/integration/files.spec.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/integration/image-small.png.spec.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/integration/image.gif.spec.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/integration/image.png.spec.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/integration/image.svg.spec.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/integration/images.spec.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/integration/video.mkv.spec.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/integration/video.mp4.spec.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/integration/video.ogv.spec.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/integration/video.webm.spec.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/integration/videos.spec.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/plugins/index.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/start.sh
>+%%WWWDIR%%/apps-pkg/viewer/cypress/stop.sh
>+%%WWWDIR%%/apps-pkg/viewer/cypress/support/commands.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/support/index.js
>+%%WWWDIR%%/apps-pkg/viewer/cypress/utils/index.js
> %%WWWDIR%%/apps-pkg/viewer/img/app.svg
> %%WWWDIR%%/apps-pkg/viewer/js/viewer.js
> %%WWWDIR%%/apps-pkg/viewer/js/viewer.js.map
>@@ -10675,8 +10693,6 @@
> %%WWWDIR%%/apps-pkg/viewer/l10n/de.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/de_DE.js
> %%WWWDIR%%/apps-pkg/viewer/l10n/de_DE.json
>-%%WWWDIR%%/apps-pkg/viewer/l10n/eo.js
>-%%WWWDIR%%/apps-pkg/viewer/l10n/eo.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/es.js
> %%WWWDIR%%/apps-pkg/viewer/l10n/es.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/eu.js
>@@ -10687,8 +10703,6 @@
> %%WWWDIR%%/apps-pkg/viewer/l10n/fr.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/gl.js
> %%WWWDIR%%/apps-pkg/viewer/l10n/gl.json
>-%%WWWDIR%%/apps-pkg/viewer/l10n/he.js
>-%%WWWDIR%%/apps-pkg/viewer/l10n/he.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/hu.js
> %%WWWDIR%%/apps-pkg/viewer/l10n/hu.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/is.js
>@@ -10697,12 +10711,8 @@
> %%WWWDIR%%/apps-pkg/viewer/l10n/it.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/ja.js
> %%WWWDIR%%/apps-pkg/viewer/l10n/ja.json
>-%%WWWDIR%%/apps-pkg/viewer/l10n/ko.js
>-%%WWWDIR%%/apps-pkg/viewer/l10n/ko.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/lt_LT.js
> %%WWWDIR%%/apps-pkg/viewer/l10n/lt_LT.json
>-%%WWWDIR%%/apps-pkg/viewer/l10n/lv.js
>-%%WWWDIR%%/apps-pkg/viewer/l10n/lv.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/nb.js
> %%WWWDIR%%/apps-pkg/viewer/l10n/nb.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/nl.js
>@@ -10715,8 +10725,6 @@
> %%WWWDIR%%/apps-pkg/viewer/l10n/pt_PT.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/ru.js
> %%WWWDIR%%/apps-pkg/viewer/l10n/ru.json
>-%%WWWDIR%%/apps-pkg/viewer/l10n/sk.js
>-%%WWWDIR%%/apps-pkg/viewer/l10n/sk.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/sl.js
> %%WWWDIR%%/apps-pkg/viewer/l10n/sl.json
> %%WWWDIR%%/apps-pkg/viewer/l10n/sq.js
>@@ -12274,8 +12282,6 @@
> %%WWWDIR%%/lib/l10n/nn_NO.json
> %%WWWDIR%%/lib/l10n/pl.js
> %%WWWDIR%%/lib/l10n/pl.json
>-%%WWWDIR%%/lib/l10n/ps.js
>-%%WWWDIR%%/lib/l10n/ps.json
> %%WWWDIR%%/lib/l10n/pt_BR.js
> %%WWWDIR%%/lib/l10n/pt_BR.json
> %%WWWDIR%%/lib/l10n/pt_PT.js
>@@ -13402,6 +13408,12 @@
> %%WWWDIR%%/settings/js/usersettings.js
> %%WWWDIR%%/settings/js/vue-0.js
> %%WWWDIR%%/settings/js/vue-0.js.map
>+%%WWWDIR%%/settings/js/vue-1.js
>+%%WWWDIR%%/settings/js/vue-1.js.map
>+%%WWWDIR%%/settings/js/vue-2.js
>+%%WWWDIR%%/settings/js/vue-2.js.map
>+%%WWWDIR%%/settings/js/vue-3.js
>+%%WWWDIR%%/settings/js/vue-3.js.map
> %%WWWDIR%%/settings/js/vue-4.js
> %%WWWDIR%%/settings/js/vue-4.js.map
> %%WWWDIR%%/settings/js/vue-5.js
>@@ -13410,6 +13422,8 @@
> %%WWWDIR%%/settings/js/vue-6.js.map
> %%WWWDIR%%/settings/js/vue-7.js
> %%WWWDIR%%/settings/js/vue-7.js.map
>+%%WWWDIR%%/settings/js/vue-8.js
>+%%WWWDIR%%/settings/js/vue-8.js.map
> %%WWWDIR%%/settings/js/vue-settings-admin-security.js
> %%WWWDIR%%/settings/js/vue-settings-admin-security.js.map
> %%WWWDIR%%/settings/js/vue-settings-apps-users-management.js
>diff --git a/www/p5-Web-Scraper/Makefile b/www/p5-Web-Scraper/Makefile
>index 00541e761d09..662088bb3da3 100644
>--- a/www/p5-Web-Scraper/Makefile
>+++ b/www/p5-Web-Scraper/Makefile
>@@ -32,8 +32,6 @@ TEST_DEPENDS=	p5-Test-Base>=0:devel/p5-Test-Base \
> USES=		perl5 shebangfix
> USE_PERL5=	modbuildtiny
> 
>-NO_ARCH=	yes
>-
> SHEBANG_FILES=	bin/scraper
> 
> post-install:
>diff --git a/www/py-starlette/Makefile b/www/py-starlette/Makefile
>index f2ffb7d822f6..dc344beb13f2 100644
>--- a/www/py-starlette/Makefile
>+++ b/www/py-starlette/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	starlette
>-PORTVERSION=	0.12.2
>+PORTVERSION=	0.12.1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git a/www/py-starlette/distinfo b/www/py-starlette/distinfo
>index be3add91d688..2b574fc235c7 100644
>--- a/www/py-starlette/distinfo
>+++ b/www/py-starlette/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562347465
>-SHA256 (starlette-0.12.2.tar.gz) = 4db50dd5c0da9659e3434f2cc469233fa1ae3c5f9a97d7c94f2a9bf3683c1847
>-SIZE (starlette-0.12.2.tar.gz) = 45522
>+TIMESTAMP = 1561049511
>+SHA256 (starlette-0.12.1.tar.gz) = d12d22f22f859131f6e772f3a2a7a8c43fb3d27c72e06ecbbdbd48506ff835d4
>+SIZE (starlette-0.12.1.tar.gz) = 45341
>diff --git a/www/qt5-webkit/Makefile b/www/qt5-webkit/Makefile
>index b94778558a86..d4fc08e998c3 100644
>--- a/www/qt5-webkit/Makefile
>+++ b/www/qt5-webkit/Makefile
>@@ -2,7 +2,6 @@
> 
> PORTNAME=		webkit
> DISTVERSION=		5.212.0-alpha3
>-PORTREVISION=	1
> CATEGORIES=		www
> MASTER_SITES=		https://github.com/qt${PORTNAME}/qt${PORTNAME}/releases/download/${DISTNAME}/
> PKGNAMEPREFIX=		qt5-
>@@ -17,8 +16,7 @@ LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
> 			libhyphen.so:textproc/hyphen \
> 			libicui18n.so:devel/icu \
> 			libpng.so:graphics/png \
>-			libwebp.so:graphics/webp \
>-			libwoff2dec.so:devel/woff2
>+			libwebp.so:graphics/webp
> 
> USES=			bison cmake compiler:c++11-lang gperf jpeg \
> 			pathfix perl5 pkgconfig python:2.7,build qt:5 sqlite:3 \
>diff --git a/www/tomcat8/Makefile b/www/tomcat8/Makefile
>new file mode 100644
>index 000000000000..acf9ceacc544
>--- /dev/null
>+++ b/www/tomcat8/Makefile
>@@ -0,0 +1,102 @@
>+# Created by: Alex Dupre <ale@FreeBSD.org>
>+# $FreeBSD$
>+
>+PORTNAME=	tomcat
>+PORTVERSION=	8.0.50
>+PORTREVISION=	2
>+CATEGORIES=	www java
>+MASTER_SITES=	APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin
>+PKGNAMESUFFIX=	8
>+DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
>+
>+MAINTAINER=	ale@FreeBSD.org
>+COMMENT=	Open-source Java web server by Apache, 8.x branch
>+
>+LICENSE=	APACHE20
>+
>+DEPRECATED=	EoL since 2018-06-30
>+EXPIRATION_DATE=	2019-06-30
>+
>+RUN_DEPENDS=	jsvc:devel/jakarta-commons-daemon
>+
>+USES=		cpe
>+CPE_VENDOR=	apache
>+
>+USE_JAVA=	yes
>+JAVA_VERSION=	1.7+
>+NO_BUILD=	yes
>+NO_ARCH=	yes
>+
>+USE_RC_SUBR=	${PKGBASE}
>+
>+TOMCAT_SUBDIR?=	${DISTNAME:R}
>+TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
>+PLIST_SUB=	T=${TOMCAT_SUBDIR} \
>+		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
>+SUB_LIST=	TOMCAT_HOME=${TOMCAT_HOME} \
>+		TOMCAT_USER=${WWWOWN} \
>+		JAVA_HOME=${JAVA_HOME}
>+
>+OPTIONS_DEFINE=		HOST_MANAGER MANAGER DOCS EXAMPLES ROOT
>+OPTIONS_DEFAULT=	HOST_MANAGER MANAGER ROOT
>+OPTIONS_SUB=		yes
>+
>+DOCS_DESC=		Install Documentation web application
>+EXAMPLES_DESC=		Install Examples web application
>+HOST_MANAGER_DESC=	Install Host Manager application
>+MANAGER_DESC=		Install Manager web application
>+ROOT_DESC=		Install default ROOT web application
>+
>+.include <bsd.port.pre.mk>
>+
>+pre-patch:
>+	@${ECHO_MSG} "Installation settings:"
>+	@${ECHO_MSG} "   Destination directory:    ${TOMCAT_HOME}"
>+	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
>+	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
>+
>+do-install:
>+	@${ECHO_MSG} -n ">> Creating destination directory..."
>+	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
>+	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed
>+	@${ECHO_MSG} " [ DONE ]"
>+
>+	@${ECHO_MSG} -n ">> Copying files to destination directory..."
>+	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
>+	@${ECHO_MSG} " [ DONE ]"
>+
>+	@${ECHO_MSG} -n ">> Fixing permissions..."
>+	@${FIND} ${STAGEDIR}${TOMCAT_HOME} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
>+	@${ECHO_MSG} " [ DONE ]"
>+
>+post-install:
>+	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
>+	(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
>+		for f in $$(find . -type f); do ${MV} $$f $$f.sample; done)
>+
>+post-install-HOST_MANAGER-on:
>+	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
>+		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml; do \
>+			${MV} $$f $$f.sample; done)
>+
>+post-install-HOST_MANAGER-off:
>+	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager
>+
>+post-install-MANAGER-on:
>+	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
>+		for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
>+			${MV} $$f $$f.sample; done)
>+
>+post-install-MANAGER-off:
>+	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/manager
>+
>+post-install-DOCS-off:
>+	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/docs
>+
>+post-install-EXAMPLES-off:
>+	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/examples
>+
>+post-install-ROOT-off:
>+	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/ROOT
>+
>+.include <bsd.port.post.mk>
>diff --git a/www/tomcat8/distinfo b/www/tomcat8/distinfo
>new file mode 100644
>index 000000000000..465e239ed2da
>--- /dev/null
>+++ b/www/tomcat8/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1519390943
>+SHA256 (apache-tomcat-8.0.50.tar.gz) = d26f11fb16de96254de815b72b84848891339c8ccbf95e9d5b08a5aef9a8e812
>+SIZE (apache-tomcat-8.0.50.tar.gz) = 9417189
>diff --git a/www/tomcat8/files/tomcat8.in b/www/tomcat8/files/tomcat8.in
>new file mode 100644
>index 000000000000..e758c22e7696
>--- /dev/null
>+++ b/www/tomcat8/files/tomcat8.in
>@@ -0,0 +1,124 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+# PROVIDE: tomcat8
>+# REQUIRE: LOGIN
>+# KEYWORD: shutdown
>+
>+#
>+# Configuration settings for tomcat8 in /etc/rc.conf:
>+#
>+# tomcat8_enable (bool):
>+#   Set to "NO" by default.
>+#   Set it to "YES" to enable tomcat8
>+#
>+# tomcat8_catalina_base (str)
>+#   Set to "%%TOMCAT_HOME%%" by default.
>+#   Set the CATALINA_BASE variable for the Tomcat process
>+#
>+# tomcat8_catalina_tmpdir (str)
>+#   Set to "${catalina.base}/temp" by default.
>+#   Set the CATALINA_TMPDIR variable for the Tomcat process
>+#
>+# tomcat8_stdout (str)
>+#   Set to "${catalina.base}/logs/catalina.out" by default.
>+#   Set the stdout redirection. It may also be '/dev/null', '&1' or '&2'
>+#
>+# tomcat8_stderr (str)
>+#   Set to "&1" by default.
>+#   Set the stderr redirection. It may also be '/dev/null', '&1' or '&2'
>+#
>+# tomcat8_pipe_cmd (str):
>+#   Set to "" by default.
>+#   Set a piped command to process stdout/stderr when passthru
>+#
>+# tomcat8_logging_manager (str):
>+#   Set to "org.apache.juli.ClassLoaderLogManager" by default.
>+#   Set the JUL log manager
>+#
>+# tomcat8_logging_config (str):
>+#   Set to "${catalina.base}/conf/logging.properties" by default.
>+#   Set the JUL config file 
>+#
>+# tomcat8_java_home (str):
>+#   Set to "%%JAVA_HOME%%" by default.
>+#   Specify the Java VM to use.
>+#
>+# tomcat8_classpath (str):
>+#   Set to "" by default.
>+#   Addtional classes to add to the CLASSPATH. If set, must start with ':'
>+#
>+# tomcat8_java_opts (str):
>+#   Set to "" by default.
>+#   Java VM args to use.
>+#
>+# tomcat8_wait (int):
>+#   Set to "30" by default.
>+#   Set the wait time (in seconds) for Tomcat process startup
>+#
>+# You may symlink this script with other names to run multiple
>+# instances of tomcat8 with different configurations.
>+#
>+
>+. /etc/rc.subr
>+
>+case $0 in
>+/etc/rc*)
>+	# during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown),
>+	# so get the name of the script from $_file
>+	name=$_file
>+	;;
>+*)
>+	name=$0
>+	;;
>+esac
>+
>+name=${name##*/}
>+rcvar=${name}_enable
>+
>+load_rc_config "${name}"
>+
>+eval "${rcvar}=\${${rcvar}:-'NO'}"
>+eval "_tomcat_java_home=\${${name}_java_home:-'%%JAVA_HOME%%'}"
>+eval "_tomcat_catalina_user=\${${name}_catalina_user:-'%%TOMCAT_USER%%'}"
>+eval "_tomcat_catalina_home='%%TOMCAT_HOME%%'"
>+eval "_tomcat_catalina_base=\${${name}_catalina_base:-'%%TOMCAT_HOME%%'}"
>+eval "_tomcat_catalina_tmpdir=\${${name}_catalina_tmpdir:-'${_tomcat_catalina_base}/temp'}"
>+eval "_tomcat_stdout=\${${name}_stdout:-'${_tomcat_catalina_base}/logs/catalina.out'}"
>+eval "_tomcat_stderr=\${${name}_stderr:-'&1'}"
>+eval "_tomcat_pipe_cmd=\${${name}_pipe_cmd:-''}"
>+eval "_tomcat_logging_manager=\${${name}_logging_manager:-'org.apache.juli.ClassLoaderLogManager'}"
>+eval "_tomcat_logging_config=\${${name}_logging_config:-'${_tomcat_catalina_base}/conf/logging.properties'}"
>+eval "_tomcat_classpath=\${${name}_classpath:-''}"
>+eval "_tomcat_java_opts=\${${name}_java_opts:-''}"
>+eval "_tomcat_wait=\${${name}_wait:-'30'}"
>+
>+pidfile="/var/run/${name}.pid"
>+
>+required_files="${_tomcat_catalina_base}/conf/server.xml"
>+required_dirs="${_tomcat_catalina_tmpdir}"
>+
>+extra_commands="reload"
>+
>+command="%%LOCALBASE%%/bin/jsvc"
>+command_args="-java-home '${_tomcat_java_home}' \
>+	-server \
>+	-user ${_tomcat_catalina_user} \
>+	-pidfile '${pidfile}' \
>+	-wait ${_tomcat_wait} \
>+	-outfile '${_tomcat_stdout}' \
>+	-errfile '${_tomcat_stderr}' \
>+	-classpath '%%TOMCAT_HOME%%/bin/bootstrap.jar:%%LOCALBASE%%/share/java/classes/commons-daemon.jar:%%TOMCAT_HOME%%/bin/tomcat-juli.jar${_tomcat_classpath}' \
>+	-Djava.util.logging.manager=${_tomcat_logging_manager} \
>+	-Djava.util.logging.config.file='${_tomcat_logging_config}' \
>+	${_tomcat_java_opts} \
>+	-Djava.endorsed.dirs='%%TOMCAT_HOME%%/endorsed' \
>+	-Dcatalina.home='${_tomcat_catalina_home}' \
>+	-Dcatalina.base='${_tomcat_catalina_base}' \
>+	-Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \
>+	org.apache.catalina.startup.Bootstrap \
>+	${_tomcat_pipe_cmd}"
>+
>+run_rc_command "$1"
>diff --git a/www/tomcat8/pkg-descr b/www/tomcat8/pkg-descr
>new file mode 100644
>index 000000000000..82942de596bd
>--- /dev/null
>+++ b/www/tomcat8/pkg-descr
>@@ -0,0 +1,9 @@
>+Apache Tomcat is a web server written in 100% Pure Java.
>+
>+Apache Tomcat version 8.0 implements the Servlet 3.1, JavaServer Pages 2.3,
>+Java Unified Expression Language 3.0 and Java WebSocket 1.0 specifications
>+from the Java Community Process, and includes many additional features that
>+make it a useful platform for developing and deploying web applications and
>+web services. Tomcat 8 is aligned with Java EE 7.
>+
>+WWW: http://tomcat.apache.org/
>diff --git a/www/tomcat8/pkg-plist b/www/tomcat8/pkg-plist
>new file mode 100644
>index 000000000000..ec8c86d85979
>--- /dev/null
>+++ b/www/tomcat8/pkg-plist
>@@ -0,0 +1,644 @@
>+%%T%%/LICENSE
>+%%T%%/NOTICE
>+%%T%%/RELEASE-NOTES
>+%%T%%/RUNNING.txt
>+%%T%%/bin/bootstrap.jar
>+%%T%%/bin/catalina-tasks.xml
>+%%T%%/bin/catalina.sh
>+%%T%%/bin/commons-daemon-native.tar.gz
>+%%T%%/bin/commons-daemon.jar
>+%%T%%/bin/configtest.sh
>+%%T%%/bin/daemon.sh
>+%%T%%/bin/digest.sh
>+%%T%%/bin/setclasspath.sh
>+%%T%%/bin/shutdown.sh
>+%%T%%/bin/startup.sh
>+%%T%%/bin/tomcat-juli.jar
>+%%T%%/bin/tomcat-native.tar.gz
>+%%T%%/bin/tool-wrapper.sh
>+%%T%%/bin/version.sh
>+%%T%%/lib/annotations-api.jar
>+%%T%%/lib/catalina-ant.jar
>+%%T%%/lib/catalina-ha.jar
>+%%T%%/lib/catalina-storeconfig.jar
>+%%T%%/lib/catalina-tribes.jar
>+%%T%%/lib/catalina.jar
>+%%T%%/lib/ecj-4.6.3.jar
>+%%T%%/lib/el-api.jar
>+%%T%%/lib/jasper-el.jar
>+%%T%%/lib/jasper.jar
>+%%T%%/lib/jsp-api.jar
>+%%T%%/lib/servlet-api.jar
>+%%T%%/lib/tomcat-api.jar
>+%%T%%/lib/tomcat-coyote.jar
>+%%T%%/lib/tomcat-dbcp.jar
>+%%T%%/lib/tomcat-i18n-es.jar
>+%%T%%/lib/tomcat-i18n-fr.jar
>+%%T%%/lib/tomcat-i18n-ja.jar
>+%%T%%/lib/tomcat-jdbc.jar
>+%%T%%/lib/tomcat-jni.jar
>+%%T%%/lib/tomcat-util-scan.jar
>+%%T%%/lib/tomcat-util.jar
>+%%T%%/lib/tomcat-websocket.jar
>+%%T%%/lib/websocket-api.jar
>+@dir %%T%%/endorsed
>+@postunexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually
>+@owner %%WWWOWN%%
>+@group %%WWWGRP%%
>+@dir %%T%%/conf
>+@dir %%T%%/logs
>+@dir %%T%%/temp
>+@dir %%T%%/webapps
>+@dir %%T%%/work
>+@sample %%T%%/conf/catalina.policy.sample
>+@sample %%T%%/conf/catalina.properties.sample
>+@sample %%T%%/conf/context.xml.sample
>+@sample %%T%%/conf/logging.properties.sample
>+@sample %%T%%/conf/server.xml.sample
>+@sample %%T%%/conf/tomcat-users.xml.sample
>+@sample %%T%%/conf/tomcat-users.xsd.sample
>+@sample %%T%%/conf/web.xml.sample
>+%%T%%/temp/safeToDelete.tmp
>+%%ROOT%%%%T%%/webapps/ROOT/RELEASE-NOTES.txt
>+%%ROOT%%%%T%%/webapps/ROOT/WEB-INF/web.xml
>+%%ROOT%%%%T%%/webapps/ROOT/asf-logo-wide.svg
>+%%ROOT%%%%T%%/webapps/ROOT/bg-button.png
>+%%ROOT%%%%T%%/webapps/ROOT/bg-middle.png
>+%%ROOT%%%%T%%/webapps/ROOT/bg-nav-item.png
>+%%ROOT%%%%T%%/webapps/ROOT/bg-nav.png
>+%%ROOT%%%%T%%/webapps/ROOT/bg-upper.png
>+%%ROOT%%%%T%%/webapps/ROOT/favicon.ico
>+%%ROOT%%%%T%%/webapps/ROOT/index.jsp
>+%%ROOT%%%%T%%/webapps/ROOT/tomcat-power.gif
>+%%ROOT%%%%T%%/webapps/ROOT/tomcat.css
>+%%ROOT%%%%T%%/webapps/ROOT/tomcat.gif
>+%%ROOT%%%%T%%/webapps/ROOT/tomcat.png
>+%%ROOT%%%%T%%/webapps/ROOT/tomcat.svg
>+%%DOCS%%%%T%%/webapps/docs/BUILDING.txt
>+%%DOCS%%%%T%%/webapps/docs/RELEASE-NOTES.txt
>+%%DOCS%%%%T%%/webapps/docs/RUNNING.txt
>+%%DOCS%%%%T%%/webapps/docs/WEB-INF/web.xml
>+%%DOCS%%%%T%%/webapps/docs/aio.html
>+%%DOCS%%%%T%%/webapps/docs/api/index.html
>+%%DOCS%%%%T%%/webapps/docs/appdev/build.xml.txt
>+%%DOCS%%%%T%%/webapps/docs/appdev/deployment.html
>+%%DOCS%%%%T%%/webapps/docs/appdev/index.html
>+%%DOCS%%%%T%%/webapps/docs/appdev/installation.html
>+%%DOCS%%%%T%%/webapps/docs/appdev/introduction.html
>+%%DOCS%%%%T%%/webapps/docs/appdev/processes.html
>+%%DOCS%%%%T%%/webapps/docs/appdev/sample/build.xml
>+%%DOCS%%%%T%%/webapps/docs/appdev/sample/docs/README.txt
>+%%DOCS%%%%T%%/webapps/docs/appdev/sample/index.html
>+%%DOCS%%%%T%%/webapps/docs/appdev/sample/sample.war
>+%%DOCS%%%%T%%/webapps/docs/appdev/sample/src/mypackage/Hello.java
>+%%DOCS%%%%T%%/webapps/docs/appdev/sample/web/WEB-INF/web.xml
>+%%DOCS%%%%T%%/webapps/docs/appdev/sample/web/hello.jsp
>+%%DOCS%%%%T%%/webapps/docs/appdev/sample/web/images/tomcat.gif
>+%%DOCS%%%%T%%/webapps/docs/appdev/sample/web/index.html
>+%%DOCS%%%%T%%/webapps/docs/appdev/source.html
>+%%DOCS%%%%T%%/webapps/docs/appdev/web.xml.txt
>+%%DOCS%%%%T%%/webapps/docs/apr.html
>+%%DOCS%%%%T%%/webapps/docs/architecture/index.html
>+%%DOCS%%%%T%%/webapps/docs/architecture/overview.html
>+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess.html
>+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/authentication-process.png
>+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/request-process.png
>+%%DOCS%%%%T%%/webapps/docs/architecture/startup.html
>+%%DOCS%%%%T%%/webapps/docs/architecture/startup/serverStartup.pdf
>+%%DOCS%%%%T%%/webapps/docs/architecture/startup/serverStartup.txt
>+%%DOCS%%%%T%%/webapps/docs/balancer-howto.html
>+%%DOCS%%%%T%%/webapps/docs/building.html
>+%%DOCS%%%%T%%/webapps/docs/cgi-howto.html
>+%%DOCS%%%%T%%/webapps/docs/changelog.html
>+%%DOCS%%%%T%%/webapps/docs/class-loader-howto.html
>+%%DOCS%%%%T%%/webapps/docs/cluster-howto.html
>+%%DOCS%%%%T%%/webapps/docs/comments.html
>+%%DOCS%%%%T%%/webapps/docs/config/ajp.html
>+%%DOCS%%%%T%%/webapps/docs/config/automatic-deployment.html
>+%%DOCS%%%%T%%/webapps/docs/config/cluster-channel.html
>+%%DOCS%%%%T%%/webapps/docs/config/cluster-deployer.html
>+%%DOCS%%%%T%%/webapps/docs/config/cluster-interceptor.html
>+%%DOCS%%%%T%%/webapps/docs/config/cluster-listener.html
>+%%DOCS%%%%T%%/webapps/docs/config/cluster-manager.html
>+%%DOCS%%%%T%%/webapps/docs/config/cluster-membership.html
>+%%DOCS%%%%T%%/webapps/docs/config/cluster-receiver.html
>+%%DOCS%%%%T%%/webapps/docs/config/cluster-sender.html
>+%%DOCS%%%%T%%/webapps/docs/config/cluster-valve.html
>+%%DOCS%%%%T%%/webapps/docs/config/cluster.html
>+%%DOCS%%%%T%%/webapps/docs/config/context.html
>+%%DOCS%%%%T%%/webapps/docs/config/cookie-processor.html
>+%%DOCS%%%%T%%/webapps/docs/config/credentialhandler.html
>+%%DOCS%%%%T%%/webapps/docs/config/engine.html
>+%%DOCS%%%%T%%/webapps/docs/config/executor.html
>+%%DOCS%%%%T%%/webapps/docs/config/filter.html
>+%%DOCS%%%%T%%/webapps/docs/config/globalresources.html
>+%%DOCS%%%%T%%/webapps/docs/config/host.html
>+%%DOCS%%%%T%%/webapps/docs/config/http.html
>+%%DOCS%%%%T%%/webapps/docs/config/index.html
>+%%DOCS%%%%T%%/webapps/docs/config/jar-scan-filter.html
>+%%DOCS%%%%T%%/webapps/docs/config/jar-scanner.html
>+%%DOCS%%%%T%%/webapps/docs/config/listeners.html
>+%%DOCS%%%%T%%/webapps/docs/config/loader.html
>+%%DOCS%%%%T%%/webapps/docs/config/manager.html
>+%%DOCS%%%%T%%/webapps/docs/config/realm.html
>+%%DOCS%%%%T%%/webapps/docs/config/resources.html
>+%%DOCS%%%%T%%/webapps/docs/config/server.html
>+%%DOCS%%%%T%%/webapps/docs/config/service.html
>+%%DOCS%%%%T%%/webapps/docs/config/sessionidgenerator.html
>+%%DOCS%%%%T%%/webapps/docs/config/systemprops.html
>+%%DOCS%%%%T%%/webapps/docs/config/valve.html
>+%%DOCS%%%%T%%/webapps/docs/connectors.html
>+%%DOCS%%%%T%%/webapps/docs/default-servlet.html
>+%%DOCS%%%%T%%/webapps/docs/deployer-howto.html
>+%%DOCS%%%%T%%/webapps/docs/developers.html
>+%%DOCS%%%%T%%/webapps/docs/elapi/index.html
>+%%DOCS%%%%T%%/webapps/docs/extras.html
>+%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-apps.html
>+%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-objects.html
>+%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-opers.html
>+%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-default.html
>+%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-jdbc-realm.html
>+%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-jndi-realm.html
>+%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-memory-realm.html
>+%%DOCS%%%%T%%/webapps/docs/funcspecs/index.html
>+%%DOCS%%%%T%%/webapps/docs/funcspecs/mbean-names.html
>+%%DOCS%%%%T%%/webapps/docs/host-manager-howto.html
>+%%DOCS%%%%T%%/webapps/docs/html-host-manager-howto.html
>+%%DOCS%%%%T%%/webapps/docs/html-manager-howto.html
>+%%DOCS%%%%T%%/webapps/docs/images/add.gif
>+%%DOCS%%%%T%%/webapps/docs/images/asf-logo.svg
>+%%DOCS%%%%T%%/webapps/docs/images/code.gif
>+%%DOCS%%%%T%%/webapps/docs/images/cors-flowchart.png
>+%%DOCS%%%%T%%/webapps/docs/images/design.gif
>+%%DOCS%%%%T%%/webapps/docs/images/docs-stylesheet.css
>+%%DOCS%%%%T%%/webapps/docs/images/docs.gif
>+%%DOCS%%%%T%%/webapps/docs/images/fix.gif
>+%%DOCS%%%%T%%/webapps/docs/images/fonts/OpenSans400.woff
>+%%DOCS%%%%T%%/webapps/docs/images/fonts/OpenSans400italic.woff
>+%%DOCS%%%%T%%/webapps/docs/images/fonts/OpenSans600.woff
>+%%DOCS%%%%T%%/webapps/docs/images/fonts/OpenSans600italic.woff
>+%%DOCS%%%%T%%/webapps/docs/images/fonts/OpenSans700.woff
>+%%DOCS%%%%T%%/webapps/docs/images/fonts/OpenSans700italic.woff
>+%%DOCS%%%%T%%/webapps/docs/images/fonts/fonts.css
>+%%DOCS%%%%T%%/webapps/docs/images/printer.gif
>+%%DOCS%%%%T%%/webapps/docs/images/tomcat.gif
>+%%DOCS%%%%T%%/webapps/docs/images/tomcat.png
>+%%DOCS%%%%T%%/webapps/docs/images/tomcat.svg
>+%%DOCS%%%%T%%/webapps/docs/images/update.gif
>+%%DOCS%%%%T%%/webapps/docs/images/void.gif
>+%%DOCS%%%%T%%/webapps/docs/index.html
>+%%DOCS%%%%T%%/webapps/docs/introduction.html
>+%%DOCS%%%%T%%/webapps/docs/jasper-howto.html
>+%%DOCS%%%%T%%/webapps/docs/jdbc-pool.html
>+%%DOCS%%%%T%%/webapps/docs/jndi-datasource-examples-howto.html
>+%%DOCS%%%%T%%/webapps/docs/jndi-resources-howto.html
>+%%DOCS%%%%T%%/webapps/docs/jspapi/index.html
>+%%DOCS%%%%T%%/webapps/docs/logging.html
>+%%DOCS%%%%T%%/webapps/docs/manager-howto.html
>+%%DOCS%%%%T%%/webapps/docs/maven-jars.html
>+%%DOCS%%%%T%%/webapps/docs/mbeans-descriptors.dtd
>+%%DOCS%%%%T%%/webapps/docs/mbeans-descriptors-howto.html
>+%%DOCS%%%%T%%/webapps/docs/monitoring.html
>+%%DOCS%%%%T%%/webapps/docs/proxy-howto.html
>+%%DOCS%%%%T%%/webapps/docs/realm-howto.html
>+%%DOCS%%%%T%%/webapps/docs/rewrite.html
>+%%DOCS%%%%T%%/webapps/docs/security-howto.html
>+%%DOCS%%%%T%%/webapps/docs/security-manager-howto.html
>+%%DOCS%%%%T%%/webapps/docs/servletapi/index.html
>+%%DOCS%%%%T%%/webapps/docs/setup.html
>+%%DOCS%%%%T%%/webapps/docs/ssi-howto.html
>+%%DOCS%%%%T%%/webapps/docs/ssl-howto.html
>+%%DOCS%%%%T%%/webapps/docs/tribes/developers.html
>+%%DOCS%%%%T%%/webapps/docs/tribes/faq.html
>+%%DOCS%%%%T%%/webapps/docs/tribes/interceptors.html
>+%%DOCS%%%%T%%/webapps/docs/tribes/introduction.html
>+%%DOCS%%%%T%%/webapps/docs/tribes/membership.html
>+%%DOCS%%%%T%%/webapps/docs/tribes/setup.html
>+%%DOCS%%%%T%%/webapps/docs/tribes/status.html
>+%%DOCS%%%%T%%/webapps/docs/tribes/transport.html
>+%%DOCS%%%%T%%/webapps/docs/virtual-hosting-howto.html
>+%%DOCS%%%%T%%/webapps/docs/web-socket-howto.html
>+%%DOCS%%%%T%%/webapps/docs/websocketapi/index.html
>+%%DOCS%%%%T%%/webapps/docs/windows-auth-howto.html
>+%%DOCS%%%%T%%/webapps/docs/windows-service-howto.html
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/CookieExample.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/CookieExample.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/HelloWorldExample.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/HelloWorldExample.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings.properties
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_en.properties
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/RequestHeaderExample.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/RequestInfoExample.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/RequestInfoExample.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/RequestParamExample.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/RequestParamExample.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/ServletToJsp.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/ServletToJsp.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/SessionExample.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/SessionExample.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async0$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async0.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async0.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async1$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async1.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async2$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async2.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async2.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async3.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Async3.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/AsyncStockContextListener.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/AsyncStockContextListener.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Stockticker$Stock.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Stockticker$TickListener.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Stockticker.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/async/Stockticker.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/cal/Entries.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/cal/Entries.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/cal/Entry.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/cal/Entry.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/cal/JspCalendar.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/cal/TableBean.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/cal/TableBean.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/chat/ChatServlet$MessageSender.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/chat/ChatServlet.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/dates/JspCalendar.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/error/Smart.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/error/Smart.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/FooTag.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/FooTag.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/LogTag.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/LogTag.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ShowSource.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ShowSource.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ValuesTag.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ValuesTag.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/listeners/ContextListener.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/listeners/SessionListener.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/ByteCounter$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/ByteCounter$CounterListener.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/ByteCounter.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/ByteCounter.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/NumberWriter$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/NumberWriter$NumberWriterListener.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/NumberWriter.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/nonblocking/NumberWriter.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/sessions/DummyCart.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/util/CookieFilter.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/util/CookieFilter.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/util/HTMLFilter.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/validators/DebugValidator.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Client$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage$ParseException.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$2.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$3$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$3.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$1$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$2.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$MessageType.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$Player.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/AbstractWebsocketMessage.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/AbstractWebsocketMessage.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/BinaryWebsocketMessage.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/BinaryWebsocketMessage.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/CloseWebsocketMessage.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/CloseWebsocketMessage.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/StringWebsocketMessage.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/StringWebsocketMessage.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation$CompletedFuture.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$EchoMessageHandlerBinary.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$EchoMessageHandlerText.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoStreamAnnotation.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoStreamAnnotation.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/servers.json
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Direction.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Direction.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Location$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Location.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Location.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Snake.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer$1.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.class
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/applet/Clock2.java
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/debug-taglib.tld
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/example-taglib.tld
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/tags/displayProducts.tag
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/tags/helloWorld.tag
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/tags/panel.tag
>+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/web.xml
>+%%EXAMPLES%%%%T%%/webapps/examples/index.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/async/async1.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/async/async1.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/async/async3.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/async/async3.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/async/index.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/async/index.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/cal/Entries.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/cal/Entry.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/cal/JspCalendar.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/cal/TableBean.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/cal/cal1.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/cal/cal1.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/cal/cal2.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/cal/cal2.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/cal/calendar.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/cal/login.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/checkbox/CheckTest.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/checkbox/check.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/checkbox/checkresult.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/checkbox/checkresult.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/checkbox/cresult.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/colors/ColorGameBean.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/colors/clr.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/colors/colors.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/colors/colrs.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/colors/colrs.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/dates/date.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/dates/date.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/dates/date.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/error/er.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/error/err.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/error/err.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/error/error.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/error/errorpge.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/error/errorpge.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/forward/forward.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/forward/forward.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/forward/fwd.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/forward/one.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/forward/one.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/forward/two.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/images/code.gif
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/images/execute.gif
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/images/read.gif
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/images/return.gif
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/include/foo.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/include/foo.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/include/foo.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/include/inc.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/include/include.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/include/include.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/index.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/Functions.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/ValuesBean.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/ValuesTag.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/basic-arithmetic.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/basic-comparisons.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/composite.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/composite.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/composite.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/functions.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/functions.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/functions.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/implicit-objects.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/el/implicit-objects.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspattribute/FooBean.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspattribute/shuffle.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspx/basic.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspx/basic.jspx
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspx/basic.jspx.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspx/svgexample.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspx/textRotate.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspx/textRotate.jpg
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspx/textRotate.jspx
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/jspx/textRotate.jspx.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/misc/coda.jspf
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/misc/coda.jspf.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/misc/config.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/misc/config.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/misc/config.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/misc/dynamicattrs.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/misc/prelude.jspf
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/misc/prelude.jspf.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/BookBean.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/Functions.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/book.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/book.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/book.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/hello.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/hello.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/hello.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/repeat.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/simpletag/repeat.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/hello.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/hello.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/hello.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/helloWorld.tag.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/panel.tag.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/products.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/products.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsp2/tagfiles/products.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsptoserv/ServletToJsp.java.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsptoserv/hello.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsptoserv/hello.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/jsptoserv/jts.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/num/numguess.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/num/numguess.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/num/numguess.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/plugin/applet/Clock2.class
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/plugin/applet/Clock2.java
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/plugin/plugin.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/plugin/plugin.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/plugin/plugin.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/security/protected/error.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/security/protected/error.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/security/protected/index.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/security/protected/index.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/security/protected/login.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/security/protected/login.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/sessions/DummyCart.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/sessions/carts.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/sessions/carts.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/sessions/carts.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/sessions/crt.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/simpletag/foo.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/simpletag/foo.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/simpletag/foo.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/snp/snoop.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/snp/snoop.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/snp/snoop.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/source.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/source.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/choose.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/choose.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/choose.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/foreach.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/foreach.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/foreach.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/howto.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/if.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/if.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/if.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/tagplugin/notes.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/xml/xml.html
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/xml/xml.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/jsp/xml/xml.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/chat/index.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/chat/index.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/chat/login.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/chat/login.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/chat/post.jsp
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/chat/post.jsp.html
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/cookies.html
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/helloworld.html
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/images/code.gif
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/images/execute.gif
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/images/return.gif
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/index.html
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/nonblocking/bytecounter.html
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/reqheaders.html
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/reqinfo.html
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/reqparams.html
>+%%EXAMPLES%%%%T%%/webapps/examples/servlets/sessions.html
>+%%EXAMPLES%%%%T%%/webapps/examples/websocket/chat.xhtml
>+%%EXAMPLES%%%%T%%/webapps/examples/websocket/drawboard.xhtml
>+%%EXAMPLES%%%%T%%/webapps/examples/websocket/echo.xhtml
>+%%EXAMPLES%%%%T%%/webapps/examples/websocket/index.xhtml
>+%%EXAMPLES%%%%T%%/webapps/examples/websocket/snake.xhtml
>+%%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/META-INF/context.xml.sample
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/401.jsp
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/404.jsp
>+%%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/WEB-INF/web.xml.sample
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/add.gif
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/asf-logo.svg
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/code.gif
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/design.gif
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/docs.gif
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/fix.gif
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/tomcat.gif
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/update.gif
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/void.gif
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/index.jsp
>+%%HOST_MANAGER%%%%T%%/webapps/host-manager/manager.xml
>+%%MANAGER%%@sample %%T%%/webapps/manager/META-INF/context.xml.sample
>+%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/401.jsp
>+%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/403.jsp
>+%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/404.jsp
>+%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
>+%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
>+%%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp
>+%%MANAGER%%@sample %%T%%/webapps/manager/WEB-INF/web.xml.sample
>+%%MANAGER%%%%T%%/webapps/manager/images/add.gif
>+%%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg
>+%%MANAGER%%%%T%%/webapps/manager/images/code.gif
>+%%MANAGER%%%%T%%/webapps/manager/images/design.gif
>+%%MANAGER%%%%T%%/webapps/manager/images/docs.gif
>+%%MANAGER%%%%T%%/webapps/manager/images/fix.gif
>+%%MANAGER%%%%T%%/webapps/manager/images/tomcat.gif
>+%%MANAGER%%%%T%%/webapps/manager/images/update.gif
>+%%MANAGER%%%%T%%/webapps/manager/images/void.gif
>+%%MANAGER%%%%T%%/webapps/manager/index.jsp
>+%%MANAGER%%%%T%%/webapps/manager/status.xsd
>+%%MANAGER%%%%T%%/webapps/manager/xform.xsl
>diff --git a/www/trac-accountmanager/Makefile b/www/trac-accountmanager/Makefile
>index 567687580483..6f603b79e120 100644
>--- a/www/trac-accountmanager/Makefile
>+++ b/www/trac-accountmanager/Makefile
>@@ -2,9 +2,11 @@
> 
> PORTNAME=	accountmanager
> PORTVERSION=	0.5.${REV}
>+PORTREVISION=	2
> PORTEPOCH=	1
> CATEGORIES=	www devel python
>-MASTER_SITES=	http://trac-hacks.org/changeset/${REV}/accountmanagerplugin/trunk?old_path=/&format=zip&filename=
>+MASTER_SITES=	LOCAL/kuriyama \
>+		http://trac-hacks.org/changeset/${REV}/accountmanagerplugin/trunk?old_path=/&format=zip&filename=
> PKGNAMEPREFIX=	trac-
> DIST_SUBDIR=	trac
> 
>@@ -17,10 +19,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> RUN_DEPENDS=	tracd:www/trac
> 
> FETCH_BEFORE_ARGS=	-o ${DISTFILES}
>-REV=			17339
>-WRKSRC=			${WRKDIR}/accountmanagerplugin/trunk
>+REV=			12583
> USES=			python:2.7 zip
> USE_PYTHON=		distutils autoplist
>+WRKSRC=			${WRKDIR}/accountmanagerplugin/trunk
> NO_ARCH=		yes
> 
> # --- trac.ini
>diff --git a/www/trac-accountmanager/distinfo b/www/trac-accountmanager/distinfo
>index 8c3012c0654c..0f49be37eeb4 100644
>--- a/www/trac-accountmanager/distinfo
>+++ b/www/trac-accountmanager/distinfo
>@@ -1,3 +1,2 @@
>-TIMESTAMP = 1557078449
>-SHA256 (trac/accountmanager-0.5.17339.zip) = b3b56a81ca307e22662194907f1e246be00094ab867a8c6b9b16d9a9b1c7748f
>-SIZE (trac/accountmanager-0.5.17339.zip) = 360825
>+SHA256 (trac/accountmanager-0.5.12583.zip) = 704c89934a2be65f051f602e71c9162b6e1c48710dcf42a72b68e6e7e446c0b6
>+SIZE (trac/accountmanager-0.5.12583.zip) = 309199
>diff --git a/www/trac-accountmanager/pkg-descr b/www/trac-accountmanager/pkg-descr
>index e64be83c0873..eeea4fc3c87f 100644
>--- a/www/trac-accountmanager/pkg-descr
>+++ b/www/trac-accountmanager/pkg-descr
>@@ -1,4 +1,4 @@
> Trac plugin to enable users to register new accounts or manage their
> existing account.
> 
>-WWW: https://trac-hacks.org/wiki/AccountManagerPlugin
>+WWW: http://trac-hacks.org/wiki/AccountManagerPlugin
>diff --git a/x11-themes/plata-theme/Makefile b/x11-themes/plata-theme/Makefile
>index d357b14bcffb..d4bb91831f9d 100644
>--- a/x11-themes/plata-theme/Makefile
>+++ b/x11-themes/plata-theme/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	plata-theme
>-PORTVERSION=	0.8.7
>+PORTVERSION=	0.8.6
> CATEGORIES=	x11-themes
> 
> MAINTAINER=	tagattie@yandex.com
>@@ -24,7 +24,7 @@ USE_GNOME=	gdkpixbuf2 gtk30 libxml2
> USE_GITLAB=	yes
> GL_SITE=	https://gitlab.com
> GL_ACCOUNT=	tista500
>-GL_COMMIT=	f97472e9cd3dada19d50fa2ab0e4c24b4ac2e710
>+GL_COMMIT=	b503811645a7b241f6381d34e4f16fc63566ef72
> 
> NO_ARCH=	yes
> 
>diff --git a/x11-themes/plata-theme/distinfo b/x11-themes/plata-theme/distinfo
>index 9c107fb6379e..b41c44908801 100644
>--- a/x11-themes/plata-theme/distinfo
>+++ b/x11-themes/plata-theme/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562320096
>-SHA256 (tista500-plata-theme-f97472e9cd3dada19d50fa2ab0e4c24b4ac2e710_GL0.tar.gz) = f6cccb5c432dae7f49493ec46c066316ab4867b12b66106e276dab0da57f3d94
>-SIZE (tista500-plata-theme-f97472e9cd3dada19d50fa2ab0e4c24b4ac2e710_GL0.tar.gz) = 472855
>+TIMESTAMP = 1561428776
>+SHA256 (tista500-plata-theme-b503811645a7b241f6381d34e4f16fc63566ef72_GL0.tar.gz) = 54468e600eedbac91815a0ed52850e8806007098b7c3eff7c5bdd6f6ea0ba337
>+SIZE (tista500-plata-theme-b503811645a7b241f6381d34e4f16fc63566ef72_GL0.tar.gz) = 472803
>diff --git a/x11/libfm-qt/Makefile b/x11/libfm-qt/Makefile
>index 60c2b49abe02..07b0cfb6ea29 100644
>--- a/x11/libfm-qt/Makefile
>+++ b/x11/libfm-qt/Makefile
>@@ -10,7 +10,6 @@ MAINTAINER=	mbeis@xs4all.nl
> COMMENT=	Qt port of libfm
> 
> LICENSE=	LGPL21+
>-LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
> 		libexif.so:graphics/libexif
>diff --git a/x11/libfm-qt/pkg-descr b/x11/libfm-qt/pkg-descr
>index fa7c4db548f9..ebc58729e308 100644
>--- a/x11/libfm-qt/pkg-descr
>+++ b/x11/libfm-qt/pkg-descr
>@@ -1,4 +1,4 @@
> A Qt port of the libfm - a library providing components to build
> desktop file managers.
> 
>-WWW: https://github.com/lxqt/libfm-qt
>+WWW: https://github.com/lxde/libfm-qt

Actions: View | Diff

Attachments on bug 234216: 200304 | 200558 | 202235 | 205533 | 205534 | 205554 | 205555