*/*: sync with upstream

Taken from: HardenedBSD
2020-02-20 10:13:36 +01:00 · 2020-02-20 10:13:36 +01:00 · 45397d7c45
commit 45397d7c45
parent 634c0a6560
697 changed files with 12971 additions and 4117 deletions
--- a/archivers/kf5-karchive/distinfo
+++ b/archivers/kf5-karchive/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578227617
-SHA256 (KDE/frameworks/5.66.0/karchive-5.66.0.tar.xz) = 434f315af624d315b06a35ba5e71e570f36ca454af891833d6e896e42edf23d8
-SIZE (KDE/frameworks/5.66.0/karchive-5.66.0.tar.xz) = 459012
+TIMESTAMP = 1580664345
+SHA256 (KDE/frameworks/5.67.0/karchive-5.67.0.tar.xz) = d6b8bc7d05dcb437dddfebd46d539d51eefe05bb0903cc13628770d80183ed82
+SIZE (KDE/frameworks/5.67.0/karchive-5.67.0.tar.xz) = 459424
--- a/archivers/py-pyliblzma/Makefile
+++ b/archivers/py-pyliblzma/Makefile
@ -14,7 +14,7 @@ COMMENT=	Python binding for the LZMA compression library
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		pkgconfig python:-2.7 tar:bzip2
+USES=		pkgconfig python:2.7 tar:bzip2
 USE_PYTHON=	autoplist distutils

 post-install:
--- a/astro/geographiclib/Makefile
+++ b/astro/geographiclib/Makefile
@ -2,12 +2,12 @@
 # $FreeBSD$

 PORTNAME=	geographiclib
-DISTVERSION=	1.50
+DISTVERSION=	1.50.1
 CATEGORIES=	astro
 MASTER_SITES=	SF/geographiclib/distrib\
 		SF/geographiclib/distrib/archive\
 		SF/geographiclib:geoids,gravity,magnetic
-DISTNAME=	GeographicLib-${DISTVERSION}${DISTVERSIONSUFFIX}
+DISTNAME=	GeographicLib-${DISTVERSIONFULL}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}	#
 DIST_SUBDIR=	GeographicLib

@ -18,7 +18,6 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

 USES=		cmake compiler:c++14-lang python:env
-WRKSRC=		${WRKDIR}/GeographicLib-${DISTVERSION}
 PORTDOCS=	*
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DGEOGRAPHICLIB_DATA:STRING=${DATADIR:Q}\
@ -29,10 +28,11 @@ CMAKE_ARGS=	-DGEOGRAPHICLIB_DATA:STRING=${DATADIR:Q}\
 OPTIONS_DEFINE=	DOCS DOXYGEN PERL
 OPTIONS_DEFAULT=	DOXYGEN PERL\
 			GEOID_EGM96_5 GRAVITY_EGM96 GRAVITY_WGS84\
-			MAGNETIC_WMM2015V2 MAGNETIC_IGRF12
+			MAGNETIC_WMM2020 MAGNETIC_IGRF12
 PERL_DESC=	Build documentation with pod2man and pod2html
 OPTIONS_GROUP=	DATASETS
 OPTIONS_SUB=	yes
+DATASETS_DESC=	geoid datasets, gravity models and magnetic field models
 DOXYGEN_CMAKE_BOOL=	GEOGRAPHICLIB_DOCUMENTATION
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen\
 			sphinx-build:textproc/py-sphinx
@ -44,7 +44,8 @@ PERL_BUILD_DEPENDS=	nroff:textproc/groff
 GEOID_NAMES=		egm84-30 egm84-15 egm96-15 egm96-5\
 			egm2008-5 egm2008-2_5 egm2008-1
 GRAVITY_NAMES=		egm84 egm96 egm2008 wgs84 grs80
-MAGNETIC_NAMES=		wmm2010 wmm2015 wmm2015v2 igrf11 igrf12\
+MAGNETIC_NAMES=		wmm2010 wmm2015 wmm2015v2 wmm2020\
+			igrf11 igrf12\
 			emm2010 emm2015 emm2017
 DEPRECATED_NAMES=	wmm2015

@ -70,7 +71,6 @@ MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DISTFILES=	magnetic-distrib/${n}.tar.bz2:ma
 MAKESUM_OPTIONS_DEFAULT+=	MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu}
 .endfor

-# Memorandum: use "make fetch makesum" to makesum all distfiles.
 .ifmake makesum || distclean
 OPTIONS_DEFAULT=	${MAKESUM_OPTIONS_DEFAULT}
 .endif
--- a/astro/geographiclib/distinfo
+++ b/astro/geographiclib/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1569492000
-SHA256 (GeographicLib/GeographicLib-1.50.tar.gz) = 2ac8888094d21ba48adb433c4bb569937497b39733e96c080b5ce278e2587622
-SIZE (GeographicLib/GeographicLib-1.50.tar.gz) = 2463958
+TIMESTAMP = 1581822000
+SHA256 (GeographicLib/GeographicLib-1.50.1.tar.gz) = d1765009e068b8cc5e76957e5d6be45ce6cff08c4aad8e5995e84a28354385f1
+SIZE (GeographicLib/GeographicLib-1.50.1.tar.gz) = 2463854
 SHA256 (GeographicLib/geoids-distrib/egm2008-1.tar.bz2) = bdb382d0be7ece9142450eacc24b7b7f0889ee3e0ba4f535b04ec383f94c0fb5
 SIZE (GeographicLib/geoids-distrib/egm2008-1.tar.bz2) = 162388303
 SHA256 (GeographicLib/geoids-distrib/egm2008-2_5.tar.bz2) = d602e13446a4a4a23f39aecfe6a2a0760a1bc6c1b497482c2ebc9f7d513be699
@ -41,3 +41,5 @@ SHA256 (GeographicLib/magnetic-distrib/wmm2015.tar.bz2) = 4c3fddb09955bbb556a955
 SIZE (GeographicLib/magnetic-distrib/wmm2015.tar.bz2) = 1425
 SHA256 (GeographicLib/magnetic-distrib/wmm2015v2.tar.bz2) = fda5e84ee803644c8695637f66ca2b278657633de6f83573eb988713d643a419
 SIZE (GeographicLib/magnetic-distrib/wmm2015v2.tar.bz2) = 1448
+SHA256 (GeographicLib/magnetic-distrib/wmm2020.tar.bz2) = 0a33e726b88f9aac390d5a64ba2b4e5aa4533dd98699955bc9f23278df3b5a52
+SIZE (GeographicLib/magnetic-distrib/wmm2020.tar.bz2) = 1434
--- a/astro/geographiclib/files/patch-CMakeLists.txt
+++ b/astro/geographiclib/files/patch-CMakeLists.txt
@ -1,4 +1,4 @@
--- CMakeLists.txt.orig	2019-09-24 12:55:55 UTC
+--- CMakeLists.txt.orig	2019-12-12 10:51:35 UTC
 +++ CMakeLists.txt
@@ -183,6 +183,11 @@ option (APPLE_MULTIPLE_ARCHITECTURES
 # directory is present you get this behavior regardless.
@ -12,7 +12,7 @@
 set (LIBNAME Geographic)
 if (MSVC OR CMAKE_CONFIGURATION_TYPES)
   # For multi-config systems and for Visual Studio, the debug version of
-@@ -475,7 +480,7 @@ endif ()
+@@ -464,7 +469,7 @@ endif ()
 # documentation files into the source tree.  Skip Apple here because
 # man/makeusage.sh uses "head --lines -4" to drop the last 4 lines of a
 # file and there's no simple equivalent for MacOSX
--- a/astro/geographiclib/pkg-descr
+++ b/astro/geographiclib/pkg-descr
@ -1,10 +1,8 @@
 GeographicLib is a small set of C++ classes for performing conversions
 between geographic, UTM, UPS, MGRS, geocentric, and local cartesian
 coordinates, for gravity (e.g., EGM2008), geoid height, and geomagnetic
-field (e.g., WMM2010) calculations, and for solving geodesic problems.
+field (e.g., WMM2020) calculations, and for solving geodesic problems.

-The library may be used from .NET applications using the NETGeographicLib
-wrapper library.  It is a suitable replacement for the core functionality
-provided by geotrans.
+It is a suitable replacement for the core functionality provided by geotrans.

-WWW: http://geographiclib.sourceforge.net/
+WWW: https://geographiclib.sourceforge.io/
--- a/astro/geographiclib/pkg-help
+++ b/astro/geographiclib/pkg-help
@ -0,0 +1,43 @@
+Geoid datasets used by the GeographicLib::Geoid class and the GeoidEval
+tool to compute geoid heights.
+
+  Available geoid data files
+                                  size (MB)
+  name         geoid    grid    tar.bz2  disk
+  egm84-30     EGM84    30'      0.5      0.6
+  egm84-15     EGM84    15'      1.5      2.1
+  egm96-15     EGM96    15'      1.5      2.1
+  egm96-5      EGM96     5'       11       19
+  egm2008-5    EGM2008   5'       11       19
+  egm2008-2_5  EGM2008   2.5'     35       75
+  egm2008-1    EGM2008   1'      170      470
+
+Gravity models used by the GeographicLib::GravityModel class and the
+Gravity tool to compute gravity fields.
+
+  Available gravity models
+                       size (kB)
+  name     degree    tar.bz2  disk
+  egm84      18       27      26
+  egm96      360     2100    2100
+  egm2008   2190    76000   75000
+  wgs84      20        1       1
+  grs80      20        1       1
+
+Magnetic models used by the GeographicLib::MagneticModel class and the
+MagneticField tool to compute magnetic fields.
+
+  Available magnetic models
+                                  size (kB)
+  name     degree    years      tar.bz2  disk
+  wmm2010    12    2010-2015      2       3
+  wmm2015    12    2015-2020      2       3  *deprecated*
+  wmm2015v2  12    2015-2020      2       3
+  wmm2020    12    2020-2025      2       3
+  igrf11     13    1900-2015      7      25
+  igrf12     13    1900-2020      7      26
+  emm2010   739    2010-2015    3700    4400
+  emm2015   729    2000-2020     660    4300
+  emm2017   790    2000-2022    1740    5050
+
+The size columns give the download and installed sizes of the datasets.
--- a/astro/geographiclib/pkg-plist
+++ b/astro/geographiclib/pkg-plist
@ -61,7 +61,7 @@ lib/cmake/GeographicLib/geographiclib-targets.cmake
 lib/libGeographic.a
 lib/libGeographic.so
 lib/libGeographic.so.19
-lib/libGeographic.so.19.0.0
+lib/libGeographic.so.19.0.1
 lib/node_modules/geographiclib/LICENSE.txt
 lib/node_modules/geographiclib/README.md
 lib/node_modules/geographiclib/geographiclib.js
@ -148,6 +148,8 @@ sbin/geographiclib-get-magnetic
 %%MAGNETIC_WMM2015%%%%DATADIR%%/magnetic/wmm2015.wmm.cof
 %%MAGNETIC_WMM2015V2%%%%DATADIR%%/magnetic/wmm2015v2.wmm
 %%MAGNETIC_WMM2015V2%%%%DATADIR%%/magnetic/wmm2015v2.wmm.cof
+%%MAGNETIC_WMM2020%%%%DATADIR%%/magnetic/wmm2020.wmm
+%%MAGNETIC_WMM2020%%%%DATADIR%%/magnetic/wmm2020.wmm.cof
 share/matlab/geographiclib-legacy/Contents.m
 share/matlab/geographiclib-legacy/geocentricforward.m
 share/matlab/geographiclib-legacy/geocentricreverse.m
--- a/astro/p5-Astro-App-Satpass2/Makefile
+++ b/astro/p5-Astro-App-Satpass2/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Astro-App-Satpass2
-PORTVERSION=	0.043
+PORTVERSION=	0.044
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/astro/p5-Astro-App-Satpass2/distinfo
+++ b/astro/p5-Astro-App-Satpass2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1580616257
-SHA256 (Astro-App-Satpass2-0.043.tar.gz) = 98f2dbbfaacef845be2b14417e8ef61b8ee01f817d0ef93a4f8bb1f36193096c
-SIZE (Astro-App-Satpass2-0.043.tar.gz) = 315977
+TIMESTAMP = 1582011075
+SHA256 (Astro-App-Satpass2-0.044.tar.gz) = 3e206817a02c3f8eeea5f41ccdb45e820eb09b068dc92a437ebe279799020683
+SIZE (Astro-App-Satpass2-0.044.tar.gz) = 317392
--- a/astro/xearth/files/freebsd.committers.markers
+++ b/astro/xearth/files/freebsd.committers.markers
@ -181,7 +181,6 @@
 52.05,		5.283333,	"znerd"				# Driebergen-Rijsenburg, the Netherlands
 52.088936,	5.097134,	"dim"				# Utrecht, The Netherlands
 45.636772,	4.949373,	"thierry"	align=left	# Chaponnay, France
- 50.936796,	4.564304,	"philip"	align=left	# Kampenhout, Belgium
 51.890,	4.554,		"remko"				# Rotterdam, The Netherlands
 51.9201,	4.4905,		"marks"				# Rotterdam, The Netherlands
 50.383,	4.36,		"jylefort"	align=left	# Charleroi, Belgium
--- a/audio/beets/Makefile
+++ b/audio/beets/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	beets
 PORTVERSION=	1.4.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio python
 MASTER_SITES=	CHEESESHOP

@ -32,7 +32,7 @@ PLIST_FILES=	man/man1/beet.1.gz man/man5/beetsconfig.5.gz

 NO_ARCH=	yes

-OPTIONS_DEFINE=	ACOUSTICBRAINZ BADFILES BEATPORT BPD CHROMA DISCOGS EMBYUPDATE \
+OPTIONS_DEFINE=	ACOUSTICBRAINZ BADFILES BEATPORT CHROMA DISCOGS EMBYUPDATE \
 		FETCHART FFMPEG GMUSIC IMAGEMAGICK IPFS KODIUPDATE LASTFM \
 		LASTIMPORT LYRICS LYRICS_GOOGLE MPDSTATS METASYNC_DBUS \
 		PLEXUPDATE REPLAYGAIN SONOS_UPDATE SPOTIFY THUMBNAILS WEB \
@ -41,7 +41,6 @@ OPTIONS_DEFINE=	ACOUSTICBRAINZ BADFILES BEATPORT BPD CHROMA DISCOGS EMBYUPDATE \
 ACOUSTICBRAINZ_DESC=	AcousticBrainz Plugin
 BADFILES_DESC=	Bad Files Plugin
 BEATPORT_DESC=	Beatport Catalog Autotagging Support
-BPD_DESC=	MPD Compatible Music Player Plugin
 DISCOGS_DESC=	Discogs Search Plugin
 EMBYUPDATE_DESC=	Emby Update Plugin
 FETCHART_DESC=	Cover Art Fetch Plugin
@ -68,8 +67,6 @@ BADFILES_RUN_DEPENDS=	flac:audio/flac \
 			mp3val:audio/mp3val
 BEATPORT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.1:www/py-requests-oauthlib@${PY_FLAVOR}
-BPD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer1>=0:multimedia/py-gstreamer1@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}gobject>=0:devel/py-gobject@${PY_FLAVOR}
 DISCOGS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discogs-client>=2.2.1:audio/py-discogs-client@${PY_FLAVOR}
 EMBYUPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 FETCHART_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
--- a/audio/cplay/Makefile
+++ b/audio/cplay/Makefile
@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	hukka

-USES=		gettext gmake python:-2.7 shebangfix
+USES=		gettext gmake python:2.7 shebangfix
 SHEBANG_FILES=	${WRKSRC}/cplay cnq

 MAKE_ARGS=	PREFIX="${STAGEDIR}${PREFIX}"
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libgpod
 PORTVERSION=	0.8.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	SF/gtkpod/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}

@ -20,13 +20,14 @@ USES=		compiler:c++11-lang gettext gmake gnome libtool localbase \
 		pathfix pkgconfig sqlite:3 tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-udev --without-hal \
+		--without-python \
 		--with-html-dir="${DOCSDIR:H}"
 USE_CSTD=	gnu89
 USE_GNOME=	gdkpixbuf2 gtk20 intltool libxml2
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes

-OPTIONS_DEFINE=	DOCS IMOBILE PYTHON MONO
+OPTIONS_DEFINE=	DOCS IMOBILE MONO
 OPTIONS_DEFAULT=IMOBILE
 OPTIONS_EXCLUDE?=	MONO
 OPTIONS_SUB=	yes
@ -39,14 +40,6 @@ IMOBILE_CONFIGURE_WITH=	libimobiledevice
 MONO_USE=		GNOME=gtksharp20
 MONO_CONFIGURE_WITH=	mono

-PYTHON_BUILD_DEPENDS=	swig3.0:devel/swig30 \
-			${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR}
-PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR}
-PYTHON_USE=		GNOME=pygobject
-PYTHON_USES=		python:2.7
-PYTHON_CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig3.0"
-PYTHON_CONFIGURE_WITH=	python
-
 PORTDOCS=	ChangeLog NEWS README*

 .include <bsd.port.options.mk>
--- a/audio/libgpod/pkg-descr
+++ b/audio/libgpod/pkg-descr
@ -9,6 +9,6 @@ from it without duplicating code.

 libgpod supports playlists, smart playlists, playcounts, ratings,
 podcasts, cover art, audio and video. Photo support is implemented as
-well. Python and Mono bindings are optionally available too.
+well. Mono bindings are optionally available too.

 WWW: http://www.gtkpod.org/wiki/Libgpod
--- a/audio/libgpod/pkg-plist
+++ b/audio/libgpod/pkg-plist
@ -5,19 +5,6 @@ lib/libgpod.a
 lib/libgpod.so
 lib/libgpod.so.4
 lib/libgpod.so.4.3.2
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/_gpod.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gpod.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gpod.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gpod.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gtkpod.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gtkpod.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gtkpod.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.pyo
 libdata/pkgconfig/libgpod-1.0.pc
 %%PORTDOCS%%%%DOCSDIR%%/ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/home.png
--- a/audio/libopenshot-audio/Makefile
+++ b/audio/libopenshot-audio/Makefile
@ -2,8 +2,8 @@

 PORTNAME=	libopenshot-audio
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.8-100
-DISTVERSIONSUFFIX=	-g006fd01
+DISTVERSION=	0.1.9-6
+DISTVERSIONSUFFIX=	-g836e49f
 CATEGORIES=	audio multimedia

 MAINTAINER=	tatsuki_makino@hotmail.com
@ -21,7 +21,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	OpenShot

 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
-		CMAKE_DISABLE_FIND_PACKAGE_ImageMagick\
 		CMAKE_DISABLE_FIND_PACKAGE_PythonInterp

 .include <bsd.port.mk>
--- a/audio/libopenshot-audio/distinfo
+++ b/audio/libopenshot-audio/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1573527600
-SHA256 (OpenShot-libopenshot-audio-v0.1.8-100-g006fd01_GH0.tar.gz) = a9d0b47483b96aade1f9e3b8015755754361e908f4c39869a17bb42a74776f9c
-SIZE (OpenShot-libopenshot-audio-v0.1.8-100-g006fd01_GH0.tar.gz) = 1712033
+TIMESTAMP = 1581390000
+SHA256 (OpenShot-libopenshot-audio-v0.1.9-6-g836e49f_GH0.tar.gz) = 5cc647309f77072288a52e736cc680685df997740e30ed8eb73ff7a811dfa8ef
+SIZE (OpenShot-libopenshot-audio-v0.1.9-6-g836e49f_GH0.tar.gz) = 1711868
--- a/audio/libopenshot-audio/files/patch-CMakeLists.txt
+++ b/audio/libopenshot-audio/files/patch-CMakeLists.txt
@ -1,11 +1,18 @@
--- CMakeLists.txt.orig	2019-10-24 07:05:50 UTC
+--- CMakeLists.txt.orig	2020-02-08 23:21:29 UTC
 +++ CMakeLists.txt
-@@ -192,7 +192,7 @@ if(UNIX AND NOT APPLE)
+@@ -192,8 +192,14 @@ if(UNIX AND NOT APPLE)
       INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIR}
       INTERFACE_LINK_LIBRARIES ${ALSA_LIBRARIES})
   endif()
 -  target_compile_definitions(openshot-audio PUBLIC LINUX)
 +  #target_compile_definitions(openshot-audio PUBLIC LINUX)
   target_link_libraries(openshot-audio PUBLIC ALSA::ALSA)
+
+	find_library(EXECINFO_LIBRARY NAMES execinfo)
+	if(NOT EXECINFO_LIBRARY)
+		message(FATAL_ERROR "${EXECINFO_LIBRARY}")
+	endif(NOT EXECINFO_LIBRARY)
+	target_link_libraries(openshot-audio PUBLIC ${EXECINFO_LIBRARY})
 endif()
 
+ # ZLIB -- uses IMPORTED target ZLIB::ZLIB which has existed since CMake 3.1
--- a/audio/libopenshot-audio/files/patch-src_CMakeLists.txt
+++ b/audio/libopenshot-audio/files/patch-src_CMakeLists.txt
@ -1,16 +0,0 @@
--- src/CMakeLists.txt.orig	2019-10-24 07:05:50 UTC
-+++ src/CMakeLists.txt
-@@ -26,8 +26,13 @@
- 
- 
- ############### TEST EXECUTABLES ################
-+find_library(EXECINFO_LIBRARY NAMES execinfo)
-+if(NOT EXECINFO_LIBRARY)
-+	message(FATAL_ERROR "${EXECINFO_LIBRARY}")
-+endif(NOT EXECINFO_LIBRARY)
- add_executable(openshot-audio-test-sound Main.cpp)
- target_link_libraries(openshot-audio-test-sound openshot-audio)
-+target_link_libraries(openshot-audio-test-sound ${EXECINFO_LIBRARY})
- set_target_properties(openshot-audio-test-sound PROPERTIES
- 	CXX_STANDARD 11
- 	CXX_STANDARD_REQUIRED YES
--- a/audio/libopenshot-audio/pkg-plist
+++ b/audio/libopenshot-audio/pkg-plist
@ -324,8 +324,8 @@ include/libopenshot-audio/juce_events/native/juce_win32_WinRTWrapper.h
 include/libopenshot-audio/juce_events/timers/juce_MultiTimer.h
 include/libopenshot-audio/juce_events/timers/juce_Timer.h
 lib/libopenshot-audio.so
-lib/libopenshot-audio.so.0.1.8
-lib/libopenshot-audio.so.6
+lib/libopenshot-audio.so.0.1.9
+lib/libopenshot-audio.so.7
 man/man1/openshot-audio-test-sound.1.gz
@dir include/libopenshot-audio/juce_audio_devices/native/java/app/com/roli/juce
@dir include/libopenshot-audio/juce_core/native/java/app/com/roli/juce
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	musicpd
-PORTVERSION=	0.21.19
+PORTVERSION=	0.21.20
 CATEGORIES=	audio
 MASTER_SITES=	https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1579302968
-SHA256 (mpd-0.21.19.tar.xz) = d3275e11d85637adde250cadf3b4f5aec2144228f0d8085767493fc46c55b2f9
-SIZE (mpd-0.21.19.tar.xz) = 676020
+TIMESTAMP = 1581965855
+SHA256 (mpd-0.21.20.tar.xz) = 422ef0a996d961f3ebc6856395f3a855b45fa0059910e878fb98281007e510e1
+SIZE (mpd-0.21.20.tar.xz) = 676396
--- a/audio/plasma5-plasma-pa/distinfo
+++ b/audio/plasma5-plasma-pa/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1581012782
-SHA256 (KDE/plasma/5.18.0/plasma-pa-5.18.0.tar.xz) = 5951d2aef3dcae97c8dc51f1ff672e1beb137b92fd0d33fbf51b772cf253b28e
-SIZE (KDE/plasma/5.18.0/plasma-pa-5.18.0.tar.xz) = 104792
+TIMESTAMP = 1582120727
+SHA256 (KDE/plasma/5.18.1/plasma-pa-5.18.1.tar.xz) = 0dedb6999aeafebbabfa13ab0f873245e1a127ad7b67ce87724e44e388638e8e
+SIZE (KDE/plasma/5.18.1/plasma-pa-5.18.1.tar.xz) = 104840
--- a/audio/py-opuslib/Makefile
+++ b/audio/py-opuslib/Makefile
@ -16,7 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libopus.so:audio/opus
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=4.4.1:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose@${PY_FLAVOR}

-USES=		python:-2.7
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes

--- a/audio/py-py-jack/Makefile
+++ b/audio/py-py-jack/Makefile
@ -16,7 +16,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libjack.so:audio/jack
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}

-USES=		python:-2.7 localbase
+USES=		python:2.7 localbase
 USE_PYTHON=	distutils autoplist

 post-patch:
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@ -15,6 +15,9 @@ COMMENT=	Object-oriented Python bindings for the vorbis library
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING

+DEPRECATED=	Unmaintained, uses EOLed python27
+EXPIRATION_DATE=	2020-03-19
+
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg@${PY_FLAVOR}
 LIB_DEPENDS=	libvorbis.so:audio/libvorbis
--- a/audio/raul/Makefile
+++ b/audio/raul/Makefile
@ -13,6 +13,9 @@ COMMENT=	C++ utility library primarily aimed at audio/musical applications
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual

+DEPRECATED=	Unmaintained, uses EOLed python27
+EXPIRATION_DATE=	2020-03-19
+
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs

 USES=		gnome pkgconfig python:2.7,build tar:bzip2 waf
--- a/biology/vsearch/Makefile
+++ b/biology/vsearch/Makefile
@ -2,7 +2,7 @@

 PORTNAME=		vsearch
 DISTVERSIONPREFIX=	v
-DISTVERSION=		2.13.4
+DISTVERSION=		2.14.2
 CATEGORIES=		biology

 MAINTAINER=	jwb@FreeBSD.org
@ -17,7 +17,7 @@ ONLY_FOR_ARCHS_REASON=	Explicitly enumerated by upstream developers

 LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo

-USES=		autoreconf gmake localbase
+USES=		autoreconf ghostscript:build gmake localbase
 USE_GITHUB=	yes

 GH_ACCOUNT=	torognes
--- a/biology/vsearch/distinfo
+++ b/biology/vsearch/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1557579514
-SHA256 (torognes-vsearch-v2.13.4_GH0.tar.gz) = 35269cbb10d1d2c33fdddd47ff4a5434eda1d4445fcc816bf4c57d7fe4740709
-SIZE (torognes-vsearch-v2.13.4_GH0.tar.gz) = 234364
+TIMESTAMP = 1581796821
+SHA256 (torognes-vsearch-v2.14.2_GH0.tar.gz) = 4eba7b28e23580a8874b528e5a7345938c8adfbf3fe7eccfe90b352dfc8a3506
+SIZE (torognes-vsearch-v2.14.2_GH0.tar.gz) = 239518
--- a/cad/linuxcnc-devel/Makefile
+++ b/cad/linuxcnc-devel/Makefile
@ -10,7 +10,6 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	Open Source CNC machine controller

-BROKEN=		wrong depends
 DEPRECATED=	Broken, uses EOLed python27
 EXPIRATION_DATE=	2020-02-19

@ -28,7 +27,7 @@ RUN_DEPENDS=	bash:shells/bash \
 		bwidget>=1.4:x11-toolkits/bwidget \
 		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:x11-toolkits/py-vte \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext \
-		${LOCALBASE}/lib/Img/libtkimg1.4.7.so:graphics/libimg
+		${LOCALBASE}/lib/Img/libtkimg1.4.9.so:graphics/libimg
 BUILD_DEPENDS=	${RUN_DEPENDS}

 NO_PACKAGE=	Licensing conflict between LinuxCNC (GPL2) and readline (GPL3)
--- a/cad/py-pycam/Makefile
+++ b/cad/py-pycam/Makefile
@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2@$
 		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext@${PY_FLAVOR}

-USES=		python:-2.7
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist

 .include <bsd.port.mk>
--- a/cad/veroroute/Makefile
+++ b/cad/veroroute/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	veroroute
 DISTVERSIONPREFIX=	V
-DISTVERSION=	178
+DISTVERSION=	179
 DISTVERSIONSUFFIX=	_Src
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/
--- a/cad/veroroute/distinfo
+++ b/cad/veroroute/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1581743314
-SHA256 (VeroRoute_V178_Src.zip) = 6136d1c850050461a796ba958c3c845eabf02e9cec9367a1eef9a3c72924ac22
-SIZE (VeroRoute_V178_Src.zip) = 950517
+TIMESTAMP = 1581925438
+SHA256 (VeroRoute_V179_Src.zip) = c78189344a7b5c47e6181d7b458205fb643e94db9de6fdd1fc567cd48074c08c
+SIZE (VeroRoute_V179_Src.zip) = 953705
--- a/comms/py-gammu/Makefile
+++ b/comms/py-gammu/Makefile
@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libGammu.so:comms/gammu

-USES=		pkgconfig python:-2.7
+USES=		pkgconfig python:2.7
 USE_PYTHON=	autoplist distutils

 .include <bsd.port.mk>
--- a/databases/ldb15/Makefile
+++ b/databases/ldb15/Makefile
@ -96,7 +96,7 @@ PLIST_FILES=		include/ldb_version.h \
 			${PKGCONFIGDIR}/ldb.pc

 .if defined(NO_PYTHON)
-USES+=			python:2.7+,build,test
+USES+=			python:build,test
 CONFIGURE_ARGS+=	--disable-python
 .else
 USES+=			python:3.4+
--- a/databases/mariadb102-server/files/patch-MDEV-21592
+++ b/databases/mariadb102-server/files/patch-MDEV-21592
@ -6,7 +6,7 @@
 
 +#ifdef __FreeBSD__
 +#include <security/pam_appl.h>
-+#elif
+#else
 #include <security/pam_ext.h>
 +#endif
 #include <security/pam_modules.h>
--- a/databases/mariadb103-server/files/patch-MDEV-21592
+++ b/databases/mariadb103-server/files/patch-MDEV-21592
@ -6,7 +6,7 @@
 
 +#ifdef __FreeBSD__
 +#include <security/pam_appl.h>
-+#elif
+#else
 #include <security/pam_ext.h>
 +#endif
 #include <security/pam_modules.h>
--- a/databases/mariadb104-server/files/patch-MDEV-21592
+++ b/databases/mariadb104-server/files/patch-MDEV-21592
@ -6,7 +6,7 @@
 
 +#ifdef __FreeBSD__
 +#include <security/pam_appl.h>
-+#elif
+#else
 #include <security/pam_ext.h>
 +#endif
 #include <security/pam_modules.h>
--- a/databases/mariadb55-server/pkg-descr
+++ b/databases/mariadb55-server/pkg-descr
@ -11,4 +11,4 @@ whole story about MariaDB. On the "About MariaDB" page you will find more
 information about all participants in the MariaDB community, including storage
 engines XtraDB and PBXT.

-WWW: http://mariadb.org/
+WWW: https://mariadb.org/
--- a/databases/postgresql-cstore_fdw/Makefile
+++ b/databases/postgresql-cstore_fdw/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	cstore_fdw
-PORTVERSION=	1.6.2
-PORTREVISION=	2
+PORTVERSION=	1.7.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
@ -16,9 +15,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c

+USES=		gmake pgsql:9.3+
+
 SUB_FILES=	pkg-message

-USES=		gmake pgsql:9.3+
 LLD_UNSAFE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	citusdata
--- a/databases/postgresql-cstore_fdw/distinfo
+++ b/databases/postgresql-cstore_fdw/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1536052906
-SHA256 (citusdata-cstore_fdw-v1.6.2_GH0.tar.gz) = 35aabbc5a1608024e6aa038d06035e90d587e805eb706eb80652eb8547783491
-SIZE (citusdata-cstore_fdw-v1.6.2_GH0.tar.gz) = 92241
+TIMESTAMP = 1582106798
+SHA256 (citusdata-cstore_fdw-v1.7.0_GH0.tar.gz) = bd8a06654b483d27b48d8196cf6baac0c7828b431b49ac097923ac0c54a1c38c
+SIZE (citusdata-cstore_fdw-v1.7.0_GH0.tar.gz) = 93313
--- a/databases/postgresql-cstore_fdw/pkg-descr
+++ b/databases/postgresql-cstore_fdw/pkg-descr
@ -3,7 +3,7 @@ Columnar (ORC) format for its data layout. ORC improves upon the RCFile format
 developed at Facebook, and brings the following benefits:
 	- Compression: Reduces in-memory and on-disk data size by 2-4x. Can be
 	  extended to support different codecs.
-	- Column projections: Only reads column data relevant to the query. 
+	- Column projections: Only reads column data relevant to the query.
 	  Improves performance for I/O bound queries.
 	- Skip indexes: Stores min/max statistics for row groups, and uses them
 	  to skip over unrelated rows.
--- a/databases/py-cdb/Makefile
+++ b/databases/py-cdb/Makefile
@ -15,6 +15,9 @@ COMMENT=	Python interface to DJB's constant database library
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

+DEPRECATED=	Unmaintained, uses EOLed python27
+EXPIRATION_DATE=	2020-03-19
+
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist

--- a/databases/py-riak/Makefile
+++ b/databases/py-riak/Makefile
@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}riak_pb>=2.0.0:devel/py-riak_pb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${PY_FLAVOR}

-USES=		python:-2.7
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils

 .include <bsd.port.mk>
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@ -57,7 +57,7 @@ PLIST_FILES+=		include/tdb.h \


 .if defined(NO_PYTHON)
-USES+=			python:2.7+,build,test
+USES+=			python:build,test
 CONFIGURE_ARGS+=	--disable-python
 .else
 USES+=			python:3.4+
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@ -30,7 +30,7 @@ OPTIONS_DEFINE=		IPYTHON
 IPYTHON_DESC=		Interactive shell support
 IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR}

-USES=		gettext gnome python:-2.7
+USES=		gettext gnome python:2.7
 USE_GNOME=	intltool pygnome2 pygtk2
 USE_PYTHON=	autoplist distutils
 PLIST_FILES+=	man/man1/gourmet.1.gz
--- a/deskutils/plasma5-milou/distinfo
+++ b/deskutils/plasma5-milou/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1581012783
-SHA256 (KDE/plasma/5.18.0/milou-5.18.0.tar.xz) = c1e2020d7b636b34216463a1862f08a49ed20c3a63aebc028252232545a6a85a
-SIZE (KDE/plasma/5.18.0/milou-5.18.0.tar.xz) = 64252
+TIMESTAMP = 1582120728
+SHA256 (KDE/plasma/5.18.1/milou-5.18.1.tar.xz) = 3a74fe8846cca7e1d01c614d5112f44f93042e0b20c60cf0c6ec10b8f18bd4c6
+SIZE (KDE/plasma/5.18.1/milou-5.18.1.tar.xz) = 64268
--- a/deskutils/plasma5-sddm-kcm/distinfo
+++ b/deskutils/plasma5-sddm-kcm/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1581012784
-SHA256 (KDE/plasma/5.18.0/sddm-kcm-5.18.0.tar.xz) = 56de2fdd02f87e93a91dfa5083e47ffeb7479b40cd1044bbe40fa1dbe758a24b
-SIZE (KDE/plasma/5.18.0/sddm-kcm-5.18.0.tar.xz) = 61988
+TIMESTAMP = 1582120729
+SHA256 (KDE/plasma/5.18.1/sddm-kcm-5.18.1.tar.xz) = fdae8dce63fd607ef2fd39008dfc1d98ec9c9fecd38c855066e5e588334943e4
+SIZE (KDE/plasma/5.18.1/sddm-kcm-5.18.1.tar.xz) = 62184
--- a/devel/Makefile
+++ b/devel/Makefile
@ -4354,6 +4354,7 @@
    SUBDIR += py-fastimport
    SUBDIR += py-fastnumbers
    SUBDIR += py-fbprophet
+    SUBDIR += py-filebytes
    SUBDIR += py-filemagic
    SUBDIR += py-first
    SUBDIR += py-five.formlib
@ -4848,6 +4849,7 @@
    SUBDIR += py-pytest-fixture-config
    SUBDIR += py-pytest-flake8
    SUBDIR += py-pytest-flakes
+    SUBDIR += py-pytest-flask
    SUBDIR += py-pytest-forked
    SUBDIR += py-pytest-helpers-namespace
    SUBDIR += py-pytest-isort
--- a/devel/R-cran-prettyunits/Makefile
+++ b/devel/R-cran-prettyunits/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	prettyunits
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}

--- a/devel/R-cran-prettyunits/distinfo
+++ b/devel/R-cran-prettyunits/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1557903623
-SHA256 (prettyunits_1.0.2.tar.gz) = 35a4980586c20650538ae1e4fed4d80fdde3f212b98546fc3c7d9469a1207f5c
-SIZE (prettyunits_1.0.2.tar.gz) = 8262
+TIMESTAMP = 1582136348
+SHA256 (prettyunits_1.1.1.tar.gz) = 9a199aa80c6d5e50fa977bc724d6e39dae1fc597a96413053609156ee7fb75c5
+SIZE (prettyunits_1.1.1.tar.gz) = 10366
--- a/devel/RStudio/Makefile
+++ b/devel/RStudio/Makefile
@ -1,21 +1,19 @@
 # $FreeBSD$

 # This port opens too many files during build, more than the default setting.
-# Its build is known to succeed with MAX_FILES_RStudio=4096 in poudriere.conf when ports-mgmt/poudriere-devel is used.
+# Its build is known to succeed with MAX_FILES_RStudio=4096 in poudriere.conf

 PORTNAME=	RStudio
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.5033
+DISTVERSION=	1.2.5033-2752
+DISTVERSIONSUFFIX=	-g29e90c87a2
 CATEGORIES=	devel math java
-MASTER_SITES=	https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \
+MASTER_SITES=	https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \
 		https://s3.amazonaws.com/rstudio-buildtools/:buildtools
 DISTFILES=	core-dictionaries.zip:dictionaries \
 		gin-${GIN_VERSION}.zip:buildtools \
 		gwt-${GWT_VERSION}.zip:buildtools \
-		mathjax-26.zip:buildtools
-
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	33c2c42d40ad.patch:-p1
+		mathjax-27.zip:buildtools

 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Integrated development environment (IDE) for R
@ -23,21 +21,21 @@ COMMENT=	Integrated development environment (IDE) for R
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING

-BROKEN=		fails to build
 BROKEN_i386=	[ERROR] Line 101: Failed to resolve 'org.rstudio.studio.client.workbench.views.vcs.common.diff.LineActionButtonRenderer.GrayResources' via deferred binding

 BUILD_DEPENDS=	ant:devel/apache-ant \
 		${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \
-		pandoc:textproc/hs-pandoc
+		pandoc:textproc/hs-pandoc \
+		R-cran-rstudioapi>0:devel/R-cran-rstudioapi
 LIB_DEPENDS=	libR.so:math/R \
 		libboost_thread.so:devel/boost-libs \
 		libinotify.so:devel/libinotify \
 		libuuid.so:misc/e2fsprogs-libuuid

-USES=		cmake desktop-file-utils fortran pkgconfig qt:5 shared-mime-info ssl
+USES=		cmake desktop-file-utils fortran localbase:ldflags pkgconfig qt:5 shared-mime-info ssl
 USE_QT=		core dbus declarative gui location network opengl printsupport sensors \
 		sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build
-USE_JAVA=	yes
+USE_JAVA=	13
 JAVA_BUILD=	yes
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME:tl}
@ -54,6 +52,7 @@ CMAKE_ARGS+=	-DRSTUDIO_BOOST_SIGNALS_VERSION=2
 CMAKE_ARGS+=	-DFREEBSD_PORT_VERSION:STRING=${DISTVERSION}
 MAKE_ENV=	HOME=${WRKDIR} \
 		JAVA_HOME=${JAVA_HOME} \
+		PATH=${JAVA_HOME}/bin:${PATH} \
 		ANT_OPTS="-Duser.home=${WRKDIR}"

 GWT_VERSION=	2.8.1
@ -63,7 +62,7 @@ post-extract:
 	@${MKDIR} ${WRKSRC}/dependencies/common/dictionaries && ${MV} ${WRKDIR}/en_* ${WRKSRC}/dependencies/common/dictionaries/
 	@${MV} ${WRKDIR}/mathjax-* ${WRKSRC}/dependencies/common/
 	@${MKDIR} ${WRKSRC}/src/gwt/lib/gwt && ${MV} ${WRKDIR}/gwt-${GWT_VERSION} ${WRKSRC}/src/gwt/lib/gwt/${GWT_VERSION}
-	@${MKDIR} ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION} && ${MV} ${WRKDIR}/*.jar ${WRKDIR}/javadoc ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION}/
+	@${MKDIR} ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION} && ${MV} ${WRKDIR}/*.jar ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION}/

 post-patch:
 	@${REINPLACE_CMD} -e ' \
--- a/devel/RStudio/distinfo
+++ b/devel/RStudio/distinfo
@ -1,14 +1,14 @@
-TIMESTAMP = 1576659216
+TIMESTAMP = 1582044685
 SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
 SIZE (core-dictionaries.zip) = 876339
 SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
 SIZE (gin-2.1.2.zip) = 1341053
 SHA256 (gwt-2.8.1.zip) = 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7
 SIZE (gwt-2.8.1.zip) = 95650299
-SHA256 (mathjax-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71
-SIZE (mathjax-26.zip) = 3061588
-SHA256 (RStudio-rstudio-v1.2.5033_GH0.tar.gz) = ff5115bda56ee0fdee0ae2eb014ce5379774aeb3714a257a52da5b91a95e4408
-SIZE (RStudio-rstudio-v1.2.5033_GH0.tar.gz) = 20456976
+SHA256 (mathjax-27.zip) = c56cbaa6c4ce03c1fcbaeb2b5ea3c312d2fb7626a360254770cbcb88fb204176
+SIZE (mathjax-27.zip) = 3285230
+SHA256 (RStudio-rstudio-v1.2.5033-2752-g29e90c87a2_GH0.tar.gz) = 0b5c722769c759b1a0e1c0d2b5c1ffcbe17acc0cfb60fe5a3934732a8416f111
+SIZE (RStudio-rstudio-v1.2.5033-2752-g29e90c87a2_GH0.tar.gz) = 89541008
 SHA256 (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 6355a7632134c8c9487056019a9c458db2c98d10388cf66b018d5461d0a947af
 SIZE (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 21977747
 SHA256 (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = b6f6f48dd9930514204739d8957c2737f0b1d110aebf9f89fa31de10598cb29b
@ -17,5 +17,3 @@ SHA256 (rstudio-rsconnect-03c379b_GH0.tar.gz) = d24b6ee49f32f650f6d10bbfc7b2f61a
 SIZE (rstudio-rsconnect-03c379b_GH0.tar.gz) = 220711
 SHA256 (trestletech-plumber-v0.4.6_GH0.tar.gz) = 7bcbfdf5a8a2e3a051d2c673ac5ac51a483ed888afe73116cba7741dbb5f63a6
 SIZE (trestletech-plumber-v0.4.6_GH0.tar.gz) = 83332
-SHA256 (33c2c42d40ad.patch) = d252111e28a7de8602b4df1f66b36dded260061f094b504895e5c789f8681091
-SIZE (33c2c42d40ad.patch) = 4875
--- a/devel/RStudio/files/patch-CMakeGlobals.txt
+++ b/devel/RStudio/files/patch-CMakeGlobals.txt
@ -1,6 +1,6 @@
--- CMakeGlobals.txt.orig	2019-09-19 13:59:21 UTC
+--- CMakeGlobals.txt.orig	2020-01-23 23:30:24 UTC
 +++ CMakeGlobals.txt
-@@ -82,7 +82,7 @@ endif()
+@@ -84,7 +84,7 @@ endif()
 
 # record git revision hash (cache it since we don't use this in development
 # mode and we don't want it to force rebuilds there)
@ -9,7 +9,7 @@
    find_program(GIT_EXECUTABLE git)
    if(GIT_EXECUTABLE)
       execute_process(
-@@ -93,6 +93,7 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVIS
+@@ -95,6 +95,7 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVIS
       SET(RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" CACHE STRING "Git Revision Hash")
    endif()
 endif()
--- a/devel/RStudio/files/patch-src_cpp_core_CMakeLists.txt
+++ b/devel/RStudio/files/patch-src_cpp_core_CMakeLists.txt
@ -1,6 +1,6 @@
--- src/cpp/core/CMakeLists.txt.orig	2019-02-16 02:00:24 UTC
+--- src/cpp/core/CMakeLists.txt.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/core/CMakeLists.txt
-@@ -156,12 +156,14 @@ if (UNIX)
+@@ -152,12 +152,14 @@ if (UNIX)
    # platform introspection
    check_symbol_exists(SA_NOCLDWAIT "signal.h" HAVE_SA_NOCLDWAIT)
    check_symbol_exists(SO_PEERCRED "sys/socket.h" HAVE_SO_PEERCRED)
--- a/devel/RStudio/files/patch-src_cpp_core_r__util_RSessionContext.cpp
+++ b/devel/RStudio/files/patch-src_cpp_core_r__util_RSessionContext.cpp
@ -1,6 +1,6 @@
--- src/cpp/core/r_util/RSessionContext.cpp.orig	2017-11-16 21:40:37 UTC
+--- src/cpp/core/r_util/RSessionContext.cpp.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/core/r_util/RSessionContext.cpp
-@@ -138,8 +138,8 @@ bool isSharedPath(const std::string& pro
+@@ -186,8 +186,8 @@ bool isSharedPath(const std::string& projectPath,
       // not shared if we're in any of the groups that own the directory
       // (note that this checks supplementary group IDs only, so the check
       // against the primary group ID above is still required)
--- a/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp
+++ b/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp
@ -1,18 +1,19 @@
--- src/cpp/core/system/PosixSched.cpp.orig	2017-11-16 21:40:37 UTC
+--- src/cpp/core/system/PosixSched.cpp.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/core/system/PosixSched.cpp
-@@ -15,7 +15,11 @@
+@@ -15,8 +15,12 @@
 
 #include <core/system/PosixSched.hpp>
 
 +#define _GNU_SOURCE
+ #include <algorithm>
 #include <sched.h>
 +#include <sys/types.h>
 +#include <sys/param.h> // w/out this fails on i386 with error: use of undeclared identifier 'NBBY'
 +#include <sys/cpuset.h>
 
- #include <core/Error.hpp>
+ #include <shared_core/Error.hpp>
 
-@@ -41,9 +45,10 @@ bool isCpuAffinityEmpty(const CpuAffinit
+@@ -42,9 +46,10 @@ bool isCpuAffinityEmpty(const CpuAffinity& cpus)
 Error getCpuAffinity(CpuAffinity* pCpus)
 {
 #ifndef __APPLE__
@ -25,7 +26,7 @@
       return systemError(errno, ERROR_LOCATION);
 
    pCpus->clear();
-@@ -55,7 +60,7 @@ Error getCpuAffinity(CpuAffinity* pCpus)
+@@ -56,7 +61,7 @@ Error getCpuAffinity(CpuAffinity* pCpus)
       else
          pCpus->push_back(false);
    }
@ -34,7 +35,7 @@
    return Success();
 #else
    return systemError(boost::system::errc::not_supported, ERROR_LOCATION);
-@@ -66,7 +71,8 @@ Error getCpuAffinity(CpuAffinity* pCpus)
+@@ -67,7 +72,8 @@ Error getCpuAffinity(CpuAffinity* pCpus)
 Error setCpuAffinity(const CpuAffinity& cpus)
 {
 #ifndef __APPLE__
@ -44,7 +45,7 @@
    CPU_ZERO(&cs);
 
    for (std::size_t i=0; i<cpus.size(); i++)
-@@ -79,7 +85,7 @@ Error setCpuAffinity(const CpuAffinity& 
+@@ -80,7 +86,7 @@ Error setCpuAffinity(const CpuAffinity& cpus)
 
    if (::sched_setaffinity(0, sizeof(cs), &cs) == -1)
       return systemError(errno, ERROR_LOCATION);
--- a/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp
+++ b/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp
@ -1,7 +1,7 @@
--- src/cpp/core/system/PosixSystem.cpp.orig	2019-09-19 13:59:21 UTC
+--- src/cpp/core/system/PosixSystem.cpp.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/core/system/PosixSystem.cpp
-@@ -46,13 +46,18 @@
- #include <libproc.h>
+@@ -47,13 +47,18 @@
+ #include <gsl/gsl>
 #endif
 
 -#ifndef __APPLE__
@ -20,7 +20,7 @@
 #include <boost/thread.hpp>
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
-@@ -920,7 +925,7 @@ Error executablePath(const char * argv0,
+@@ -917,7 +922,7 @@ Error executablePath(const char * argv0,
 
 #elif defined(HAVE_PROCSELF)
 
@ -29,7 +29,7 @@
 
 #else
 
-@@ -1429,7 +1434,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit
+@@ -1426,7 +1431,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit
       case CpuLimit:
          *pLimit = RLIMIT_CPU;
          break;
@ -38,7 +38,7 @@
       case NiceLimit:
          *pLimit = RLIMIT_NICE;
          break;
-@@ -1502,7 +1507,7 @@ Error systemInformation(SysInfo* pSysInfo)
+@@ -1499,7 +1504,7 @@ Error systemInformation(SysInfo* pSysInfo)
 {
    pSysInfo->cores = boost::thread::hardware_concurrency();
 
@ -47,7 +47,7 @@
    struct sysinfo info;
    if (::sysinfo(&info) == -1)
       return systemError(errno, ERROR_LOCATION);
-@@ -1942,7 +1947,7 @@ Error restrictCoreDumps()
+@@ -1939,7 +1944,7 @@ Error restrictCoreDumps()
       return error;
 
    // no ptrace core dumps permitted
@ -56,7 +56,7 @@
    int res = ::prctl(PR_SET_DUMPABLE, 0);
    if (res == -1)
       return systemError(errno, ERROR_LOCATION);
-@@ -1953,7 +1958,7 @@ Error restrictCoreDumps()
+@@ -1950,7 +1955,7 @@ Error restrictCoreDumps()
 
 Error enableCoreDumps()
 {
@ -65,12 +65,12 @@
    int res = ::prctl(PR_SET_DUMPABLE, 1);
    if (res == -1)
       return systemError(errno, ERROR_LOCATION);
-@@ -1979,7 +1984,7 @@ void printCoreDumpable(const std::string& context)
+@@ -1976,7 +1981,7 @@ void printCoreDumpable(const std::string& context)
    ostr << "  hard limit: " << rLimitHard << std::endl;
 
    // ptrace
 -#ifndef __APPLE__
 +#if !defined(__APPLE__) && !defined(__FreeBSD__)
-    int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL);
+    int dumpable = ::prctl(PR_GET_DUMPABLE, nullptr, nullptr, nullptr, nullptr);
    if (dumpable == -1)
       LOG_ERROR(systemError(errno, ERROR_LOCATION));
--- a/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
+++ b/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
@ -1,14 +1,14 @@
--- src/cpp/desktop/DesktopMain.cpp.orig	2019-09-19 13:59:21 UTC
+--- src/cpp/desktop/DesktopMain.cpp.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/desktop/DesktopMain.cpp
-@@ -41,6 +41,7 @@
- #include "DesktopProgressActivator.hpp"
+@@ -46,6 +46,7 @@
 #include "DesktopNetworkProxyFactory.hpp"
 #include "DesktopActivationOverlay.hpp"
+ #include "DesktopSessionServersOverlay.hpp"
 +#include "global-setenv.h"
 
 #ifdef _WIN32
 #include <core/system/RegistryKey.hpp>
-@@ -367,7 +368,7 @@ QString inferDefaultRenderingEngine()
+@@ -372,7 +373,7 @@ QString inferDefaultRenderingEngine()
 
 #endif
 
@ -17,7 +17,7 @@
 
 QString inferDefaultRenderingEngine()
 {
-@@ -426,6 +427,7 @@ void initializeRenderingEngine(std::vector<char*>* pAr
+@@ -461,6 +462,7 @@ std::string getSessionUrl()
 
 int main(int argc, char* argv[])
 {
--- a/devel/RStudio/files/patch-src_cpp_desktop_DesktopWebView.cpp
+++ b/devel/RStudio/files/patch-src_cpp_desktop_DesktopWebView.cpp
@ -1,6 +1,6 @@
--- src/cpp/desktop/DesktopWebView.cpp.orig	2019-02-18 00:53:59 UTC
+--- src/cpp/desktop/DesktopWebView.cpp.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/desktop/DesktopWebView.cpp
-@@ -257,7 +257,7 @@ void WebView::contextMenuEvent(QContextM
+@@ -272,7 +272,7 @@ void WebView::contextMenuEvent(QContextMenuEvent* even
          
       case QWebEngineContextMenuData::MediaTypeAudio:
          
@ -9,7 +9,7 @@
          if (data.mediaFlags().testFlag(QWebEngineContextMenuData::MediaPaused))
             menu->addAction(label(tr("&Play")), [&]() { triggerPageAction(QWebEnginePage::ToggleMediaPlayPause); });
          else
-@@ -274,7 +274,7 @@ void WebView::contextMenuEvent(QContextM
+@@ -289,7 +289,7 @@ void WebView::contextMenuEvent(QContextMenuEvent* even
          
       case QWebEngineContextMenuData::MediaTypeVideo:
          
@ -18,7 +18,7 @@
          if (data.mediaFlags().testFlag(QWebEngineContextMenuData::MediaPaused))
             menu->addAction(label(tr("&Play")), [&]() { triggerPageAction(QWebEnginePage::ToggleMediaPlayPause); });
          else
-@@ -332,7 +332,7 @@ void WebView::contextMenuEvent(QContextM
+@@ -347,7 +347,7 @@ void WebView::contextMenuEvent(QContextMenuEvent* even
       menu->addAction(selectAll);
    }
    
--- a/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt
+++ b/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt
@ -1,6 +1,6 @@
--- src/cpp/diagnostics/CMakeLists.txt.orig	2019-09-19 13:59:21 UTC
+--- src/cpp/diagnostics/CMakeLists.txt.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/diagnostics/CMakeLists.txt
-@@ -62,6 +62,7 @@ endif()
+@@ -57,6 +57,7 @@ add_stripped_executable(diagnostics
 # set link dependencies
 target_link_libraries(diagnostics
    rstudio-core
--- a/devel/RStudio/files/patch-src_cpp_server_CMakeLists.txt
+++ b/devel/RStudio/files/patch-src_cpp_server_CMakeLists.txt
@ -1,12 +1,12 @@
--- src/cpp/server/CMakeLists.txt.orig	2017-11-16 21:40:37 UTC
+--- src/cpp/server/CMakeLists.txt.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/server/CMakeLists.txt
-@@ -124,6 +124,9 @@ include_directories(
+@@ -156,6 +156,9 @@ include_directories(
 # define executable
- add_executable(rserver ${SERVER_SOURCE_FILES} ${SERVER_HEADER_FILES})
+ add_stripped_executable(rserver ${SERVER_SOURCE_FILES} ${SERVER_HEADER_FILES})
 
 +# additional libraries
 +target_link_libraries(rserver -L${FREEBSD_LIBDIR} -linotify)
 +
- # add origin rpath for suse/sles
- if(RSTUDIO_PACKAGE_VARIANT STREQUAL "SLES")
-    set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ # set link dependencies
+ target_link_libraries(rserver
+    rstudio-core
--- a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
+++ b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
@ -1,8 +1,8 @@
--- src/cpp/session/CMakeLists.txt.orig	2019-09-19 13:59:21 UTC
+--- src/cpp/session/CMakeLists.txt.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/session/CMakeLists.txt
-@@ -25,9 +25,9 @@ endif()
- if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26")
-   message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)")
+@@ -25,32 +25,32 @@ endif()
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27")
+   message(FATAL_ERROR "Mathjax 2.7 not found (re-run install-dependencies script to install)")
 endif()
 -if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
 -  message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
@ -11,10 +11,19 @@
 +#  message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
 +#endif()
 
- # we often install embedded versions of these packages but don't do so currently
- 
-@@ -39,19 +39,19 @@ endif()
- # endif()
+ # verify embedded packages are available
+-foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
+-   file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
+-   if(NOT PKG_FILES)
+-      message(FATAL_ERROR "${PKG} package not found (re-run install-dependencies script to install)")
+-   endif()
+-endforeach()
+#foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
+#   file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
+#   if(NOT PKG_FILES)
+#      message(FATAL_ERROR "${PKG} package not found (re-run install-dependencies script to install)")
+#   endif()
+#endforeach()
 
 # verify libclang is installed (Windows only)
 -if(WIN32)
@ -45,9 +54,9 @@
 # include files
 file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*")
 
-@@ -366,6 +366,9 @@ endif()
+@@ -390,6 +390,9 @@ endif()
 # define executable
- add_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES})
+ add_stripped_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES})
 
 +# additional libraries
 +target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify -lprocstat)
@ -55,9 +64,9 @@
 # skip libR RPATH at development time
 if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE)
    set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE)
-@@ -497,11 +500,11 @@ if (NOT RSTUDIO_SESSION_WIN32)
-       set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version")
-    endif()
+@@ -518,11 +521,11 @@ if (NOT RSTUDIO_SESSION_WIN32)
+    # install pandoc
+    set(PANDOC_VERSION "2.7.3" CACHE INTERNAL "Pandoc version")
 
 -   set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
 -   file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
@ -70,5 +79,5 @@
 +   #        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 +   #        DESTINATION  ${RSTUDIO_INSTALL_BIN}/pandoc)
 
-    # install rmarkdown package
-    # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
+    # install embedded packages
+    foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
--- a/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp
+++ b/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp
@ -1,6 +1,6 @@
--- src/cpp/session/SessionHttpMethods.cpp.orig	2017-11-16 21:40:37 UTC
+--- src/cpp/session/SessionHttpMethods.cpp.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/session/SessionHttpMethods.cpp
-@@ -326,7 +326,7 @@ std::string clientVersion()
+@@ -397,7 +397,7 @@ std::string clientVersion()
       return std::string();
 
    // clientVersion is the git revision hash
--- a/devel/RStudio/files/patch-src_cpp_session_SessionMain.cpp
+++ b/devel/RStudio/files/patch-src_cpp_session_SessionMain.cpp
@ -1,6 +1,6 @@
--- src/cpp/session/SessionMain.cpp.orig	2019-09-19 13:59:21 UTC
+--- src/cpp/session/SessionMain.cpp.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/session/SessionMain.cpp
-@@ -1633,7 +1633,11 @@ int main (int argc, char * const argv[]) 
+@@ -1711,7 +1711,11 @@ int main (int argc, char * const argv[]) 
       
       // move to own process group
 #ifndef _WIN32
--- a/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt
+++ b/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt
@ -1,6 +1,6 @@
--- src/cpp/session/postback/CMakeLists.txt.orig	2018-05-31 21:11:21 UTC
+--- src/cpp/session/postback/CMakeLists.txt.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/session/postback/CMakeLists.txt
-@@ -43,6 +43,7 @@ endif()
+@@ -36,6 +36,7 @@ add_executable(rpostback ${POSTBACK_SOURCE_FILES} ${PO
 # set link dependencies
 target_link_libraries(rpostback
    rstudio-core
--- a/devel/RStudio/files/patch-src_cpp_session_session-config.h.in
+++ b/devel/RStudio/files/patch-src_cpp_session_session-config.h.in
@ -1,4 +1,4 @@
--- src/cpp/session/session-config.h.in.orig	2019-10-25 22:16:29 UTC
+--- src/cpp/session/session-config.h.in.orig	2020-01-23 23:30:24 UTC
 +++ src/cpp/session/session-config.h.in
@@ -13,11 +13,11 @@
  *
@ -14,4 +14,4 @@
 +#define RSTUDIO_BUILD_ID "FreeBSD-port-version-${FREEBSD_RSTUDIO_VERSION}"
 #define RSTUDIO_BUILD_DATE "${CPACK_BUILD_DATE}"
 #define RSTUDIO_COPYRIGHT_YEAR "${CPACK_COPYRIGHT_YEAR}"
- #cmakedefine RSTUDIO_SERVER
+ #define RSTUDIO_PACKAGE_OS "Unknown OS"
--- a/devel/awless/Makefile
+++ b/devel/awless/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	awless
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel

 MAINTAINER=	dmgk@FreeBSD.org
@ -17,12 +17,18 @@ USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	wallix
 GH_SUBDIR=	src/github.com/wallix/${PORTNAME}
-
-OPTIONS_DEFINE=	DOCS
+GH_TUPLE=	golang:sys:33540a1f6037:golang_sys

 PLIST_FILES=	bin/awless
 PORTDOCS=	README.md CHANGELOG.md

+OPTIONS_DEFINE=	DOCS
+
+# freebsd/arm64 needs golang.org/x/sys@33540a1f6037 or later
+post-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${RLN} ${WRKSRC_golang_sys} ${WRKSRC}/vendor/golang.org/x/sys
+
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
--- a/devel/awless/distinfo
+++ b/devel/awless/distinfo
@ -1,3 +1,5 @@
-TIMESTAMP = 1529777973
+TIMESTAMP = 1581935565
 SHA256 (wallix-awless-v0.1.11_GH0.tar.gz) = 1a78636face8753cb983a5e4c1e3bfc9e1940e7eb932aa01fe2cbded46fd4292
 SIZE (wallix-awless-v0.1.11_GH0.tar.gz) = 11725608
+SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5
+SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659
--- a/devel/critcl/Makefile
+++ b/devel/critcl/Makefile
@ -2,8 +2,8 @@
 # $FreeBSD$

 PORTNAME=	critcl
-PORTVERSION=	3.1.17
-PORTREVISION=	2
+PORTVERSION=	3.1.18.1
+PORTREVISION=	0
 CATEGORIES=	devel

 MAINTAINER=	tcltk@FreeBSD.org
@ -23,7 +23,7 @@ GH_ACCOUNT=	andreas-kupries

 TEST_TARGET=	test

-PLIST_SUB+=	VER=${PORTVERSION} \
+PLIST_SUB+=	VER=${PORTVERSION:R} \
 		ARCH=${ARCH:C/arm.*/arm/:S/i386/ix86/:S/aarch64/arm/:S/mips64/mips/:S/powerpc64/powerpc/}
 PORTDOCS=	*

--- a/devel/critcl/distinfo
+++ b/devel/critcl/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1508842896
-SHA256 (andreas-kupries-critcl-3.1.17_GH0.tar.gz) = fff83b341fc07b8ff23bf1f645133bb4bffe4741da2e6f31155e522a74c228e4
-SIZE (andreas-kupries-critcl-3.1.17_GH0.tar.gz) = 1768244
+TIMESTAMP = 1582104560
+SHA256 (andreas-kupries-critcl-3.1.18.1_GH0.tar.gz) = 51bc4b099ecf59ba3bada874fc8e1611279dfd30ad4d4074257084763c49fd86
+SIZE (andreas-kupries-critcl-3.1.18.1_GH0.tar.gz) = 1825576
--- a/devel/critcl/files/patch-test_cache.test
+++ b/devel/critcl/files/patch-test_cache.test
@ -1,20 +0,0 @@
--- test/cache.test.orig	2017-10-14 02:48:11 UTC
-+++ test/cache.test
-@@ -45,7 +45,7 @@ test critcl-cache-1.0.4 {cache, wrong\#a
- 
- test critcl-cache-2.0 {cache, default, home directory} -body {
-     critcl::cache
-} -match glob -result $::env(HOME)/.critcl/*
-+} -match glob -result [file normalize $::env(HOME)/.critcl/*]
- 
- test critcl-cache-2.1 {cache, redirecting cache} -setup {
-     set here [critcl::cache]
-@@ -54,7 +54,7 @@ test critcl-cache-2.1 {cache, redirectin
- } -cleanup {
-     critcl::cache $here
-     unset here
-} -match glob -result $::env(HOME)/FOO
-+} -match glob -result [file normalize $::env(HOME)/FOO]
- 
- # -------------------------------------------------------------------------
- testsuiteCleanup
--- a/devel/critcl/files/patch-test_support_testutilities.tcl
+++ b/devel/critcl/files/patch-test_support_testutilities.tcl
@ -1,12 +0,0 @@
--- test/support/testutilities.tcl.orig	2017-10-24 11:30:43 UTC
-+++ test/support/testutilities.tcl
-@@ -4,6 +4,9 @@
- #                                          <akupries@shaw.ca>
- #                                          <andreas.kupries@gmail.com>
- 
-+set auto_path [linsert $auto_path 0 \
-+    [file join [file dirname [file dirname [file dirname [info script]]]] lib]]
-+
- namespace eval ::tcllib::testutils {
-     variable version 1.2
-     variable self    [file dirname [file join [pwd] [info script]]]
--- a/devel/critcl/pkg-plist
+++ b/devel/critcl/pkg-plist
@ -1,4 +1,8 @@
 bin/critcl
+include/critcl_callback/callback.h
+include/critcl_callback/critcl_callback.decls
+include/critcl_callback/critcl_callbackDecls.h
+include/critcl_callback/critcl_callbackStubLib.h
 lib/critcl-app%%VER%%/critcl.tcl
 lib/critcl-app%%VER%%/pkgIndex.tcl
 lib/critcl-app%%VER%%/runtime.tcl
@ -11,24 +15,23 @@ lib/critcl-app%%VER%%/tea/tclconfig/install-sh
 lib/critcl-app%%VER%%/tea/tclconfig/tcl.m4
 lib/critcl-bitmap1.0.1/bitmap.tcl
 lib/critcl-bitmap1.0.1/pkgIndex.tcl
-lib/critcl-class1.0.7/class.h
-lib/critcl-class1.0.7/class.tcl
-lib/critcl-class1.0.7/pkgIndex.tcl
-lib/critcl-cutil0.1/allocs/critcl_alloc.h
-lib/critcl-cutil0.1/asserts/critcl_assert.h
-lib/critcl-cutil0.1/cutil.tcl
-lib/critcl-cutil0.1/pkgIndex.tcl
-lib/critcl-cutil0.1/trace/critcl_trace.h
-lib/critcl-cutil0.1/trace/trace.c
-lib/critcl-emap1.1/emap.tcl
-lib/critcl-emap1.1/pkgIndex.tcl
-lib/critcl-enum1.0.1/enum.tcl
-lib/critcl-enum1.0.1/pkgIndex.tcl
-lib/critcl-iassoc1.0.2/iassoc.h
-lib/critcl-iassoc1.0.2/iassoc.tcl
-lib/critcl-iassoc1.0.2/pkgIndex.tcl
-lib/critcl-literals1.2/literals.tcl
-lib/critcl-literals1.2/pkgIndex.tcl
+lib/critcl-class1.1.1/class.h
+lib/critcl-class1.1.1/class.tcl
+lib/critcl-class1.1.1/pkgIndex.tcl
+lib/critcl-cutil0.2/allocs/critcl_alloc.h
+lib/critcl-cutil0.2/asserts/critcl_assert.h
+lib/critcl-cutil0.2/cutil.tcl
+lib/critcl-cutil0.2/pkgIndex.tcl
+lib/critcl-cutil0.2/trace/critcl_trace.h
+lib/critcl-cutil0.2/trace/trace.c
+lib/critcl-emap1.2/emap.tcl
+lib/critcl-emap1.2/pkgIndex.tcl
+lib/critcl-enum1.1/enum.tcl
+lib/critcl-enum1.1/pkgIndex.tcl
+lib/critcl-iassoc1.1/iassoc.tcl
+lib/critcl-iassoc1.1/pkgIndex.tcl
+lib/critcl-literals1.3/literals.tcl
+lib/critcl-literals1.3/pkgIndex.tcl
 lib/critcl-platform1.0.15/pkgIndex.tcl
 lib/critcl-platform1.0.15/platform.tcl
 lib/critcl-util1.1/pkgIndex.tcl
@ -96,6 +99,11 @@ lib/critcl%%VER%%/critcl_c/tkstubs.c
 lib/critcl%%VER%%/critcl_c/tkstubs_noconst.c
 lib/critcl%%VER%%/license.terms
 lib/critcl%%VER%%/pkgIndex.tcl
+lib/critcl_callback1/critcl-rt.tcl
+lib/critcl_callback1/freebsd-%%ARCH%%/callback.so
+lib/critcl_callback1/license.terms
+lib/critcl_callback1/pkgIndex.tcl
+lib/critcl_callback1/teapot.txt
 lib/critcl_md5c0.12/critcl-rt.tcl
 lib/critcl_md5c0.12/freebsd-%%ARCH%%/md5c.so
 lib/critcl_md5c0.12/license.terms
@ -130,6 +138,7 @@ lib/stubs_writer1/writer.tcl
 man/mann/critcl_app.n.gz
 man/mann/critcl_apppkg.n.gz
 man/mann/critcl_bitmap.n.gz
+man/mann/critcl_callback.n.gz
 man/mann/critcl_class.n.gz
 man/mann/critcl_cproc.n.gz
 man/mann/critcl_cutil.n.gz
--- a/devel/electron4/Makefile
+++ b/devel/electron4/Makefile
@ -9,7 +9,7 @@ MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v4.
 		https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \
 		https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
 		https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
-PKGNAMESUFFIX=	${ELECTRON_VER:C/^([0-9]+)\..+$$/\1/}
+PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
 		chromium-${CHROMIUM_OFFICIAL_VER}${EXTRACT_SUFX}:chromium_official \
 		${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
@ -64,7 +64,6 @@ GH_TUPLE=	electron:node:8bc5d171a0873c0ba49f9433798bc8b67399788c:node
 		# yaml:pyyaml:3.12:pyyaml \
 		# kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests

-#ELECTRON_VER=	4.2.12
 # Official chromium version containing "gn" which is known to work
 CHROMIUM_OFFICIAL_VER=	76.0.3809.132
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
@ -156,7 +155,7 @@ POST_BUILD_DIST_TARGETS=	electron_dist_zip electron_chromedriver_zip electron_mk
 NPM_TIMESTAMP=	1573298347

 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
-		PKGNAMESUFFIX=${PKGNAMESUFFIX}
+		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}

 .include "Makefile.version"
 .include "Makefile.tests"
--- a/devel/electron4/Makefile.version
+++ b/devel/electron4/Makefile.version
@ -1,3 +1,4 @@
 # $FreeBSD$

 ELECTRON_VER=	4.2.12
+ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
--- a/devel/electron4/pkg-plist
+++ b/devel/electron4/pkg-plist
@ -1,4 +1,4 @@
-bin/electron%%PKGNAMESUFFIX%%
+bin/electron%%ELECTRON_VER_MAJOR%%
 %%DATADIR%%/LICENSE
 %%DATADIR%%/LICENSES.chromium.html
 %%DATADIR%%/chrome_100_percent.pak
--- a/devel/git-delta/Makefile
+++ b/devel/git-delta/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	delta
-DISTVERSION=	0.0.14
-PORTREVISION=	2
+DISTVERSION=	0.0.16
 CATEGORIES=	devel
 PKGNAMEPREFIX=	git-

@ -21,11 +20,16 @@ LIB_DEPENDS+=	libonig.so:devel/oniguruma
 CARGO_CRATES=	adler32-1.0.3 \
 		aho-corasick-0.7.6 \
 		ansi_term-0.11.0 \
+		arrayref-0.3.5 \
+		arrayvec-0.5.1 \
 		atty-0.2.13 \
 		autocfg-0.1.5 \
+		backtrace-0.3.40 \
+		backtrace-sys-0.1.32 \
 		base64-0.10.1 \
 		bincode-1.1.4 \
 		bitflags-1.1.0 \
+		blake2b_simd-0.5.9 \
 		box_drawing-0.1.2 \
 		byteorder-1.3.2 \
 		cc-1.0.38 \
@ -34,17 +38,24 @@ CARGO_CRATES=	adler32-1.0.3 \
 		clicolors-control-1.0.0 \
 		cloudabi-0.0.3 \
 		console-0.7.7 \
+		constant_time_eq-0.1.4 \
 		crc32fast-1.2.0 \
+		crossbeam-utils-0.6.6 \
+		dirs-2.0.2 \
+		dirs-sys-0.3.4 \
 		either-1.5.2 \
 		encode_unicode-0.3.5 \
 		error-chain-0.12.1 \
+		failure-0.1.6 \
+		failure_derive-0.1.6 \
 		flate2-1.0.9 \
 		fnv-1.0.6 \
+		fuchsia-cprng-0.1.1 \
 		heck-0.3.1 \
 		humantime-1.2.0 \
 		itertools-0.8.0 \
 		itoa-0.4.4 \
-		lazy_static-1.3.0 \
+		lazy_static-1.4.0 \
 		lazycell-1.2.1 \
 		libc-0.2.60 \
 		line-wrap-0.1.1 \
@ -61,11 +72,20 @@ CARGO_CRATES=	adler32-1.0.3 \
 		pkg-config-0.3.15 \
 		plist-0.4.2 \
 		proc-macro2-0.4.30 \
+		proc-macro2-1.0.6 \
 		quick-error-1.2.2 \
 		quote-0.6.13 \
+		quote-1.0.2 \
+		rand_core-0.3.1 \
+		rand_core-0.4.2 \
+		rand_os-0.1.3 \
+		rdrand-0.4.0 \
 		redox_syscall-0.1.56 \
+		redox_users-0.3.1 \
 		regex-1.2.1 \
 		regex-syntax-0.6.11 \
+		rust-argon2-0.5.1 \
+		rustc-demangle-0.1.16 \
 		rustc_version-0.2.3 \
 		ryu-1.0.0 \
 		safemem-0.3.1 \
@ -82,6 +102,8 @@ CARGO_CRATES=	adler32-1.0.3 \
 		structopt-0.2.18 \
 		structopt-derive-0.2.18 \
 		syn-0.15.43 \
+		syn-1.0.11 \
+		synstructure-0.12.3 \
 		syntect-3.2.0 \
 		termios-0.3.1 \
 		textwrap-0.11.0 \
@ -89,6 +111,7 @@ CARGO_CRATES=	adler32-1.0.3 \
 		unicode-segmentation-1.3.0 \
 		unicode-width-0.1.5 \
 		unicode-xid-0.1.0 \
+		unicode-xid-0.2.0 \
 		vec_map-0.8.1 \
 		version_check-0.1.5 \
 		walkdir-2.2.9 \
--- a/devel/git-delta/distinfo
+++ b/devel/git-delta/distinfo
@ -1,20 +1,30 @@
-TIMESTAMP = 1573172941
+TIMESTAMP = 1581289143
 SHA256 (rust/crates/adler32-1.0.3.tar.gz) = 7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c
 SIZE (rust/crates/adler32-1.0.3.tar.gz) = 5734
 SHA256 (rust/crates/aho-corasick-0.7.6.tar.gz) = 58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d
 SIZE (rust/crates/aho-corasick-0.7.6.tar.gz) = 108953
 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
 SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087
+SHA256 (rust/crates/arrayref-0.3.5.tar.gz) = 0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee
+SIZE (rust/crates/arrayref-0.3.5.tar.gz) = 7644
+SHA256 (rust/crates/arrayvec-0.5.1.tar.gz) = cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8
+SIZE (rust/crates/arrayvec-0.5.1.tar.gz) = 26816
 SHA256 (rust/crates/atty-0.2.13.tar.gz) = 1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90
 SIZE (rust/crates/atty-0.2.13.tar.gz) = 4764
 SHA256 (rust/crates/autocfg-0.1.5.tar.gz) = 22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b
 SIZE (rust/crates/autocfg-0.1.5.tar.gz) = 11009
+SHA256 (rust/crates/backtrace-0.3.40.tar.gz) = 924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea
+SIZE (rust/crates/backtrace-0.3.40.tar.gz) = 68183
+SHA256 (rust/crates/backtrace-sys-0.1.32.tar.gz) = 5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491
+SIZE (rust/crates/backtrace-sys-0.1.32.tar.gz) = 518920
 SHA256 (rust/crates/base64-0.10.1.tar.gz) = 0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e
 SIZE (rust/crates/base64-0.10.1.tar.gz) = 41988
 SHA256 (rust/crates/bincode-1.1.4.tar.gz) = 9f04a5e50dc80b3d5d35320889053637d15011aed5e66b66b37ae798c65da6f7
 SIZE (rust/crates/bincode-1.1.4.tar.gz) = 14412
 SHA256 (rust/crates/bitflags-1.1.0.tar.gz) = 3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd
 SIZE (rust/crates/bitflags-1.1.0.tar.gz) = 16322
+SHA256 (rust/crates/blake2b_simd-0.5.9.tar.gz) = b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0
+SIZE (rust/crates/blake2b_simd-0.5.9.tar.gz) = 33575
 SHA256 (rust/crates/box_drawing-0.1.2.tar.gz) = ea27d8d5fd867b17523bf6788b1175fa9867f34669d057e9adaf76e27bcea44b
 SIZE (rust/crates/box_drawing-0.1.2.tar.gz) = 2819
 SHA256 (rust/crates/byteorder-1.3.2.tar.gz) = a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5
@ -31,18 +41,32 @@ SHA256 (rust/crates/cloudabi-0.0.3.tar.gz) = ddfc5b9aa5d4507acaf872de71051dfd0e3
 SIZE (rust/crates/cloudabi-0.0.3.tar.gz) = 22156
 SHA256 (rust/crates/console-0.7.7.tar.gz) = 8ca57c2c14b8a2bf3105bc9d15574aad80babf6a9c44b1058034cdf8bd169628
 SIZE (rust/crates/console-0.7.7.tar.gz) = 15251
+SHA256 (rust/crates/constant_time_eq-0.1.4.tar.gz) = 995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120
+SIZE (rust/crates/constant_time_eq-0.1.4.tar.gz) = 4654
 SHA256 (rust/crates/crc32fast-1.2.0.tar.gz) = ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1
 SIZE (rust/crates/crc32fast-1.2.0.tar.gz) = 39161
+SHA256 (rust/crates/crossbeam-utils-0.6.6.tar.gz) = 04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6
+SIZE (rust/crates/crossbeam-utils-0.6.6.tar.gz) = 32836
+SHA256 (rust/crates/dirs-2.0.2.tar.gz) = 13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3
+SIZE (rust/crates/dirs-2.0.2.tar.gz) = 11779
+SHA256 (rust/crates/dirs-sys-0.3.4.tar.gz) = afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b
+SIZE (rust/crates/dirs-sys-0.3.4.tar.gz) = 10477
 SHA256 (rust/crates/either-1.5.2.tar.gz) = 5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b
 SIZE (rust/crates/either-1.5.2.tar.gz) = 12124
 SHA256 (rust/crates/encode_unicode-0.3.5.tar.gz) = 90b2c9496c001e8cb61827acdefad780795c42264c137744cae6f7d9e3450abd
 SIZE (rust/crates/encode_unicode-0.3.5.tar.gz) = 42677
 SHA256 (rust/crates/error-chain-0.12.1.tar.gz) = 3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9
 SIZE (rust/crates/error-chain-0.12.1.tar.gz) = 27906
+SHA256 (rust/crates/failure-0.1.6.tar.gz) = f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9
+SIZE (rust/crates/failure-0.1.6.tar.gz) = 37950
+SHA256 (rust/crates/failure_derive-0.1.6.tar.gz) = 0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08
+SIZE (rust/crates/failure_derive-0.1.6.tar.gz) = 4902
 SHA256 (rust/crates/flate2-1.0.9.tar.gz) = 550934ad4808d5d39365e5d61727309bf18b3b02c6c56b729cb92e7dd84bc3d8
 SIZE (rust/crates/flate2-1.0.9.tar.gz) = 66207
 SHA256 (rust/crates/fnv-1.0.6.tar.gz) = 2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3
 SIZE (rust/crates/fnv-1.0.6.tar.gz) = 11131
+SHA256 (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba
+SIZE (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = 2950
 SHA256 (rust/crates/heck-0.3.1.tar.gz) = 20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205
 SIZE (rust/crates/heck-0.3.1.tar.gz) = 54666
 SHA256 (rust/crates/humantime-1.2.0.tar.gz) = 3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114
@ -51,8 +75,8 @@ SHA256 (rust/crates/itertools-0.8.0.tar.gz) = 5b8467d9c1cebe26feb08c640139247fac
 SIZE (rust/crates/itertools-0.8.0.tar.gz) = 78917
 SHA256 (rust/crates/itoa-0.4.4.tar.gz) = 501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f
 SIZE (rust/crates/itoa-0.4.4.tar.gz) = 11147
-SHA256 (rust/crates/lazy_static-1.3.0.tar.gz) = bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14
-SIZE (rust/crates/lazy_static-1.3.0.tar.gz) = 10616
+SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.tar.gz) = 10443
 SHA256 (rust/crates/lazycell-1.2.1.tar.gz) = b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f
 SIZE (rust/crates/lazycell-1.2.1.tar.gz) = 11691
 SHA256 (rust/crates/libc-0.2.60.tar.gz) = d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb
@ -85,16 +109,34 @@ SHA256 (rust/crates/plist-0.4.2.tar.gz) = 5f2a9f075f6394100e7c105ed1af73fb1859d6
 SIZE (rust/crates/plist-0.4.2.tar.gz) = 21132
 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/proc-macro2-1.0.6.tar.gz) = 9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27
+SIZE (rust/crates/proc-macro2-1.0.6.tar.gz) = 35414
 SHA256 (rust/crates/quick-error-1.2.2.tar.gz) = 9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0
 SIZE (rust/crates/quick-error-1.2.2.tar.gz) = 15132
 SHA256 (rust/crates/quote-0.6.13.tar.gz) = 6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1
 SIZE (rust/crates/quote-0.6.13.tar.gz) = 17475
+SHA256 (rust/crates/quote-1.0.2.tar.gz) = 053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe
+SIZE (rust/crates/quote-1.0.2.tar.gz) = 23023
+SHA256 (rust/crates/rand_core-0.3.1.tar.gz) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b
+SIZE (rust/crates/rand_core-0.3.1.tar.gz) = 15483
+SHA256 (rust/crates/rand_core-0.4.2.tar.gz) = 9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc
+SIZE (rust/crates/rand_core-0.4.2.tar.gz) = 20243
+SHA256 (rust/crates/rand_os-0.1.3.tar.gz) = 7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071
+SIZE (rust/crates/rand_os-0.1.3.tar.gz) = 18965
+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_users-0.3.1.tar.gz) = 4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d
+SIZE (rust/crates/redox_users-0.3.1.tar.gz) = 12557
 SHA256 (rust/crates/regex-1.2.1.tar.gz) = 88c3d9193984285d544df4a30c23a4e62ead42edf70a4452ceb76dac1ce05c26
 SIZE (rust/crates/regex-1.2.1.tar.gz) = 227824
 SHA256 (rust/crates/regex-syntax-0.6.11.tar.gz) = b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f
 SIZE (rust/crates/regex-syntax-0.6.11.tar.gz) = 283238
+SHA256 (rust/crates/rust-argon2-0.5.1.tar.gz) = 4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf
+SIZE (rust/crates/rust-argon2-0.5.1.tar.gz) = 27795
+SHA256 (rust/crates/rustc-demangle-0.1.16.tar.gz) = 4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783
+SIZE (rust/crates/rustc-demangle-0.1.16.tar.gz) = 19137
 SHA256 (rust/crates/rustc_version-0.2.3.tar.gz) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a
 SIZE (rust/crates/rustc_version-0.2.3.tar.gz) = 10210
 SHA256 (rust/crates/ryu-1.0.0.tar.gz) = c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997
@ -127,6 +169,10 @@ SHA256 (rust/crates/structopt-derive-0.2.18.tar.gz) = 53010261a84b37689f9ed7d395
 SIZE (rust/crates/structopt-derive-0.2.18.tar.gz) = 13088
 SHA256 (rust/crates/syn-0.15.43.tar.gz) = ee06ea4b620ab59a2267c6b48be16244a3389f8bfa0986bdd15c35b890b00af3
 SIZE (rust/crates/syn-0.15.43.tar.gz) = 184065
+SHA256 (rust/crates/syn-1.0.11.tar.gz) = dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238
+SIZE (rust/crates/syn-1.0.11.tar.gz) = 193782
+SHA256 (rust/crates/synstructure-0.12.3.tar.gz) = 67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545
+SIZE (rust/crates/synstructure-0.12.3.tar.gz) = 17788
 SHA256 (rust/crates/syntect-3.2.0.tar.gz) = e80b8831c5a543192ffc3727f01cf0e57579c6ac15558e3048bfb5708892167b
 SIZE (rust/crates/syntect-3.2.0.tar.gz) = 733464
 SHA256 (rust/crates/termios-0.3.1.tar.gz) = 72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625
@ -141,6 +187,8 @@ SHA256 (rust/crates/unicode-width-0.1.5.tar.gz) = 882386231c45df4700b275c7ff55b6
 SIZE (rust/crates/unicode-width-0.1.5.tar.gz) = 15761
 SHA256 (rust/crates/unicode-xid-0.1.0.tar.gz) = fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc
 SIZE (rust/crates/unicode-xid-0.1.0.tar.gz) = 16000
+SHA256 (rust/crates/unicode-xid-0.2.0.tar.gz) = 826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c
+SIZE (rust/crates/unicode-xid-0.2.0.tar.gz) = 14994
 SHA256 (rust/crates/vec_map-0.8.1.tar.gz) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a
 SIZE (rust/crates/vec_map-0.8.1.tar.gz) = 14959
 SHA256 (rust/crates/version_check-0.1.5.tar.gz) = 914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd
@ -159,5 +207,5 @@ SHA256 (rust/crates/xml-rs-0.8.0.tar.gz) = 541b12c998c5b56aa2b4e6f18f03664eef9a4
 SIZE (rust/crates/xml-rs-0.8.0.tar.gz) = 50974
 SHA256 (rust/crates/yaml-rust-0.4.3.tar.gz) = 65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d
 SIZE (rust/crates/yaml-rust-0.4.3.tar.gz) = 45768
-SHA256 (dandavison-delta-0.0.14_GH0.tar.gz) = 777b90bb20c89b63eb158d238dfb38914c3bc4617d65f8a0e465227f9c6884f9
-SIZE (dandavison-delta-0.0.14_GH0.tar.gz) = 651932
+SHA256 (dandavison-delta-0.0.16_GH0.tar.gz) = 631349484bb52f3bb1c22385e19d98903c094212e83fe109f97aeff0281cf00e
+SIZE (dandavison-delta-0.0.16_GH0.tar.gz) = 663442
--- a/devel/gradle/Makefile
+++ b/devel/gradle/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gradle
-PORTVERSION=	6.1.1
+PORTVERSION=	6.2
 CATEGORIES=	devel java
 MASTER_SITES=	https://downloads.gradle.org/distributions/
 EXTRACT_SUFX=	-bin.zip
--- a/devel/gradle/distinfo
+++ b/devel/gradle/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1579929232
-SHA256 (gradle-6.1.1-bin.zip) = 9d94e6e4a28ad328072ef6e56bce79a810494ae756751fdcedffdeaf27c093b1
-SIZE (gradle-6.1.1-bin.zip) = 97472434
+TIMESTAMP = 1581947350
+SHA256 (gradle-6.2-bin.zip) = b93a5f30d01195ec201e240f029c8b42d59c24086b8d1864112c83558e23cf8a
+SIZE (gradle-6.2-bin.zip) = 97724809
--- a/devel/interactive_rebase_tool/Makefile
+++ b/devel/interactive_rebase_tool/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	interactive_rebase_tool
-DISTVERSION=	1.1.0
-PORTREVISION=	4
+DISTVERSION=	1.2.1
 CATEGORIES=	devel

 MAINTAINER=	petteri.valkonen@iki.fi
--- a/devel/interactive_rebase_tool/distinfo
+++ b/devel/interactive_rebase_tool/distinfo
@ -1,4 +1,4 @@
-TIMESTAMP = 1566111607
+TIMESTAMP = 1580153977
 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
 SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087
 SHA256 (rust/crates/atty-0.2.11.tar.gz) = 9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652
@ -81,5 +81,5 @@ SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
 SHA256 (rust/crates/winreg-0.5.1.tar.gz) = a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a
 SIZE (rust/crates/winreg-0.5.1.tar.gz) = 17693
-SHA256 (MitMaro-git-interactive-rebase-tool-1.1.0_GH0.tar.gz) = c4fa28f864f84e24e7d6253074e5409f49362a99e40f481f2187b5e6a79285f7
-SIZE (MitMaro-git-interactive-rebase-tool-1.1.0_GH0.tar.gz) = 3616869
+SHA256 (MitMaro-git-interactive-rebase-tool-1.2.1_GH0.tar.gz) = 8df32f209d481580c3365a065882e40343ecc42d9e4ed593838092bb6746a197
+SIZE (MitMaro-git-interactive-rebase-tool-1.2.1_GH0.tar.gz) = 3626022
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	jenkins
-PORTVERSION=	2.220
+PORTVERSION=	2.221
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
 DISTNAME=	jenkins
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1581368992
-SHA256 (jenkins/2.220/jenkins.war) = 3f580fff6ad9721eb891361fd14b5d7cc061e0f31c3c3f0a84b9758779a803ad
-SIZE (jenkins/2.220/jenkins.war) = 66175731
+TIMESTAMP = 1582151319
+SHA256 (jenkins/2.221/jenkins.war) = f6aa122ffebb0956d6a5d67a559754e4acdf0c7cd4cc37f11b78af61290a465b
+SIZE (jenkins/2.221/jenkins.war) = 66182119
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@ -12,8 +12,10 @@ DIST_SUBDIR=	KDE/kdevelop
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plugin extensible IDE for C/C++ and other languages

-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv2+ LGPL20+
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LIB

 BUILD_DEPENDS=	kdev-pg-qt:devel/kdevelop-pg-qt \
 		llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
--- a/devel/kdevelop/pkg-descr
+++ b/devel/kdevelop/pkg-descr
@ -2,4 +2,4 @@ Open source, feature-full, plugin extensible IDE for C/C++ and other
 programming languages.  It is based on KDevPlatform and the KDE and
 Qt libraries, and it's under development since 1998.

-WWW: http://www.kdevelop.org
+WWW: https://www.kdevelop.org/
--- a/devel/kf5-extra-cmake-modules/distinfo
+++ b/devel/kf5-extra-cmake-modules/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578227618
-SHA256 (KDE/frameworks/5.66.0/extra-cmake-modules-5.66.0.tar.xz) = 2ff1a4ede28488ea787e742ab37edaacc5f59bf9188476e48f681ce23300b9c4
-SIZE (KDE/frameworks/5.66.0/extra-cmake-modules-5.66.0.tar.xz) = 340388
+TIMESTAMP = 1580664345
+SHA256 (KDE/frameworks/5.67.0/extra-cmake-modules-5.67.0.tar.xz) = e803f8740819a5620095c161883c26aaf1267d6f919d547fdd6414e7cccc0150
+SIZE (KDE/frameworks/5.67.0/extra-cmake-modules-5.67.0.tar.xz) = 339812
--- a/devel/kf5-kapidox/distinfo
+++ b/devel/kf5-kapidox/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578227618
-SHA256 (KDE/frameworks/5.66.0/kapidox-5.66.0.tar.xz) = 19af4d93adfa22ff4de832185c1e9191d35039394bb032ee60e33efc5cc456db
-SIZE (KDE/frameworks/5.66.0/kapidox-5.66.0.tar.xz) = 397472
+TIMESTAMP = 1580664345
+SHA256 (KDE/frameworks/5.67.0/kapidox-5.67.0.tar.xz) = 74f984245ff25f08633fb9476984bc92af2e5c561c24bda7b14b2ac8a4358161
+SIZE (KDE/frameworks/5.67.0/kapidox-5.67.0.tar.xz) = 396744
--- a/devel/kf5-kauth/distinfo
+++ b/devel/kf5-kauth/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578227619
-SHA256 (KDE/frameworks/5.66.0/kauth-5.66.0.tar.xz) = f167ec8f926caf348a161a39e0c0588f517fe3a49ab4f39c1dfa94f47e104414
-SIZE (KDE/frameworks/5.66.0/kauth-5.66.0.tar.xz) = 85972
+TIMESTAMP = 1580664346
+SHA256 (KDE/frameworks/5.67.0/kauth-5.67.0.tar.xz) = 4f4a0323adcfdc6f80c38c289a73a3b7af6bf5141acd80712eb669b6ffb8bcc3
+SIZE (KDE/frameworks/5.67.0/kauth-5.67.0.tar.xz) = 86072
--- a/devel/kf5-kbookmarks/distinfo
+++ b/devel/kf5-kbookmarks/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578227619
-SHA256 (KDE/frameworks/5.66.0/kbookmarks-5.66.0.tar.xz) = b225463ec0fe2424a1f5e70c83b02e3ece6a3ca80832cd2621732d18d7160a43
-SIZE (KDE/frameworks/5.66.0/kbookmarks-5.66.0.tar.xz) = 120588
+TIMESTAMP = 1580664347
+SHA256 (KDE/frameworks/5.67.0/kbookmarks-5.67.0.tar.xz) = 5c6853f7d3d10fb3997393e8347bf790d98cb1c2ceb1a6a292fa27302a3a005e
+SIZE (KDE/frameworks/5.67.0/kbookmarks-5.67.0.tar.xz) = 120776
--- a/devel/kf5-kcmutils/distinfo
+++ b/devel/kf5-kcmutils/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578227620
-SHA256 (KDE/frameworks/5.66.0/kcmutils-5.66.0.tar.xz) = e02dbf996ed93bdc2813a2a64dcb0ddeb54987dd84bbe787bd890b17d57e4a85
-SIZE (KDE/frameworks/5.66.0/kcmutils-5.66.0.tar.xz) = 240000
+TIMESTAMP = 1580664348
+SHA256 (KDE/frameworks/5.67.0/kcmutils-5.67.0.tar.xz) = ffa61de96a5b11d29b871cd9caf075995236ad3dd432738fb774c97197d9ee8b
+SIZE (KDE/frameworks/5.67.0/kcmutils-5.67.0.tar.xz) = 239872
--- a/devel/kf5-kconfig/distinfo
+++ b/devel/kf5-kconfig/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578818659
-SHA256 (KDE/frameworks/5.66.0/kconfig-5.66.0.tar.xz) = c0df73bde40162a5ffc20604c2ad343e71a6df852c3f7b05e70e1464f5f63256
-SIZE (KDE/frameworks/5.66.0/kconfig-5.66.0.tar.xz) = 244236
+TIMESTAMP = 1580664349
+SHA256 (KDE/frameworks/5.67.0/kconfig-5.67.0.tar.xz) = 5d45c5a855cc4f77cbf7faf1f41e9e3ddd06cffae60d8d83510bad360d90ccb7
+SIZE (KDE/frameworks/5.67.0/kconfig-5.67.0.tar.xz) = 251292
--- a/devel/kf5-kcoreaddons/distinfo
+++ b/devel/kf5-kcoreaddons/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578227622
-SHA256 (KDE/frameworks/5.66.0/kcoreaddons-5.66.0.tar.xz) = 8a8edf566cb08ad83cb17f942eeb8746993249cd0f7679f7eb810201b85e464b
-SIZE (KDE/frameworks/5.66.0/kcoreaddons-5.66.0.tar.xz) = 368064
+TIMESTAMP = 1580664350
+SHA256 (KDE/frameworks/5.67.0/kcoreaddons-5.67.0.tar.xz) = 95fd37ac2e42ca2a00bd9d67955af57a78e9f1cde69acd1af79cdedb3ec994e3
+SIZE (KDE/frameworks/5.67.0/kcoreaddons-5.67.0.tar.xz) = 368976
--- a/devel/kf5-kcrash/distinfo
+++ b/devel/kf5-kcrash/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578227623
-SHA256 (KDE/frameworks/5.66.0/kcrash-5.66.0.tar.xz) = 5a518059de3f3e85ee7b38a0edf348d097993518ce9b17504470f0d8aad3f2e4
-SIZE (KDE/frameworks/5.66.0/kcrash-5.66.0.tar.xz) = 23312
+TIMESTAMP = 1580664351
+SHA256 (KDE/frameworks/5.67.0/kcrash-5.67.0.tar.xz) = b372e2df0c415b941d7748abf3d0584e3f101d10c0dc4d90fa9087e3355b81ec
+SIZE (KDE/frameworks/5.67.0/kcrash-5.67.0.tar.xz) = 23460
--- a/devel/kf5-kdbusaddons/distinfo
+++ b/devel/kf5-kdbusaddons/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578227624
-SHA256 (KDE/frameworks/5.66.0/kdbusaddons-5.66.0.tar.xz) = ee600f15af2fb9a28ad15f7e0689d519211fa63b86f2e6c356bd32530ebdfa46
-SIZE (KDE/frameworks/5.66.0/kdbusaddons-5.66.0.tar.xz) = 40104
+TIMESTAMP = 1580664352
+SHA256 (KDE/frameworks/5.67.0/kdbusaddons-5.67.0.tar.xz) = ae4795d1286c97f46be9121b2761f811e36f1c586cb030ed6debd97dc7c73518
+SIZE (KDE/frameworks/5.67.0/kdbusaddons-5.67.0.tar.xz) = 39992
--- a/devel/kf5-kdeclarative/distinfo
+++ b/devel/kf5-kdeclarative/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578227624
-SHA256 (KDE/frameworks/5.66.0/kdeclarative-5.66.0.tar.xz) = ed3a334d8bce6d70e68e013d4210bd6e11cb2ebce9ede4c1813f44dada7eca73
-SIZE (KDE/frameworks/5.66.0/kdeclarative-5.66.0.tar.xz) = 175372
+TIMESTAMP = 1580664353
+SHA256 (KDE/frameworks/5.67.0/kdeclarative-5.67.0.tar.xz) = ed713c0b05565d4626e53f030e0818449b35592382e76d705a4a6e19f53ba493
+SIZE (KDE/frameworks/5.67.0/kdeclarative-5.67.0.tar.xz) = 175072
--- a/devel/kf5-kdoctools/distinfo
+++ b/devel/kf5-kdoctools/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578227625
-SHA256 (KDE/frameworks/5.66.0/kdoctools-5.66.0.tar.xz) = 41e4ca7aceab17919ef4a82ad99606f520ebfe57f30205597b4184f7a3730a7a
-SIZE (KDE/frameworks/5.66.0/kdoctools-5.66.0.tar.xz) = 428884
+TIMESTAMP = 1580664353
+SHA256 (KDE/frameworks/5.67.0/kdoctools-5.67.0.tar.xz) = 181d005583e7e2dc0159bcd42fb39bb2981976c736c9e305c5f2416278005c6a
+SIZE (KDE/frameworks/5.67.0/kdoctools-5.67.0.tar.xz) = 426208
--- a/devel/kf5-kfilemetadata/Makefile
+++ b/devel/kf5-kfilemetadata/Makefile
@ -2,7 +2,6 @@

 PORTNAME=	kfilemetadata
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel kde kde-frameworks

 MAINTAINER=	kde@FreeBSD.org
--- a/Show more
+++ b/Show more