*/*: sync with upstream

Taken from: HardenedBSD
2020-09-18 03:06:35 +02:00 · 2020-09-18 03:06:35 +02:00 · 2ba648b07e
parent 7a3a9ff80c
commit 2ba648b07e
202 changed files with 3474 additions and 1657 deletions
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@ -21,7 +21,7 @@ RUN_DEPENDS=	gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \

 NO_ARCH=	yes
 USES=		gettext gmake gnome localbase:ldflags pkgconfig python:3.4+ shebangfix tar:xz
-USE_GNOME=	gtk30 intlhack pygobject3
+USE_GNOME=	gtk30 pygobject3
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 SHEBANG_FILES=	plugins/ipython_view.py
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@ -32,7 +32,7 @@ PORTSCOUT=	limitw:1,even
 NO_ARCH=	yes
 USES=		gettext gmake gnome localbase pathfix pkgconfig \
 		python:3.4+ tar:xz
-USE_GNOME=	gtk30 pygobject3 intlhack
+USE_GNOME=	gtk30 pygobject3
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes

--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	alsa-utils
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/utils/ \
 		GENTOO
@ -12,7 +13,8 @@ COMMENT=	ALSA compatibility utils

 LICENSE=	GPLv2+

-LIB_DEPENDS=	libasound.so:audio/alsa-lib
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libfftw3f.so:math/fftw3-float
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins

 USES=		gmake localbase ncurses shebangfix tar:bzip2
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	goobox
-PORTVERSION=	3.4.2
+PORTVERSION=	3.6.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@ -21,14 +21,15 @@ LIB_DEPENDS=	libdiscid.so:audio/libdiscid \

 USE_HARDENING=	pie:off relro:off

-USES=		desktop-file-utils gettext gmake gnome localbase pkgconfig \
-		tar:xz xorg
+USES=		desktop-file-utils gettext gnome meson pkgconfig \
+		python:3.5+,build tar:xz xorg
 USE_GNOME=	glib20 gtk30 intlhack
+USE_MESON=	yes
 USE_XORG=	x11
 USE_GSTREAMER1=	yes
-GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
+BINARY_ALIAS=	python3=${PYTHON_CMD}

 GLIB_SCHEMAS=	org.gnome.Goobox.gschema.xml

@ -36,6 +37,6 @@ OPTIONS_DEFINE=	NOTIFY
 OPTIONS_DEFAULT=NOTIFY

 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
-NOTIFY_CONFIGURE_ENABLE=notification
+NOTIFY_MESON_TRUE=disable-libnotify

 .include <bsd.port.mk>
--- a/audio/goobox/distinfo
+++ b/audio/goobox/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1491084534
-SHA256 (gnome3/goobox-3.4.2.tar.xz) = e0d2cead2597d652ea2b4655498ad8d26e3b175a5c5a12381ef521b045421d38
-SIZE (gnome3/goobox-3.4.2.tar.xz) = 563420
+TIMESTAMP = 1591948647
+SHA256 (gnome3/goobox-3.6.0.tar.xz) = 5c4cd30463a82dd873f297f27774867ede3e6a8679ee12a12d790508dc46b046
+SIZE (gnome3/goobox-3.6.0.tar.xz) = 384812
--- a/audio/goobox/pkg-plist
+++ b/audio/goobox/pkg-plist
@ -1,7 +1,5 @@
 bin/goobox
-share/GConf/gsettings/goobox.convert
-share/appdata/goobox.appdata.xml
-share/applications/goobox.desktop
+share/applications/org.gnome.Goobox.desktop
 share/help/C/goobox/index.page
 share/help/C/goobox/legal.xml
 share/help/C/goobox/preferences.page
@ -34,6 +32,18 @@ share/help/oc/goobox/index.page
 share/help/oc/goobox/legal.xml
 share/help/oc/goobox/preferences.page
 share/help/oc/goobox/shortcuts.page
+share/help/pl/goobox/index.page
+share/help/pl/goobox/legal.xml
+share/help/pl/goobox/preferences.page
+share/help/pl/goobox/shortcuts.page
+share/help/pt_BR/goobox/index.page
+share/help/pt_BR/goobox/legal.xml
+share/help/pt_BR/goobox/preferences.page
+share/help/pt_BR/goobox/shortcuts.page
+share/help/ro/goobox/index.page
+share/help/ro/goobox/legal.xml
+share/help/ro/goobox/preferences.page
+share/help/ro/goobox/shortcuts.page
 share/help/sl/goobox/index.page
 share/help/sl/goobox/legal.xml
 share/help/sl/goobox/preferences.page
@ -60,6 +70,7 @@ share/locale/es/LC_MESSAGES/goobox.mo
 share/locale/eu/LC_MESSAGES/goobox.mo
 share/locale/fi/LC_MESSAGES/goobox.mo
 share/locale/fr/LC_MESSAGES/goobox.mo
+share/locale/fur/LC_MESSAGES/goobox.mo
 share/locale/gl/LC_MESSAGES/goobox.mo
 share/locale/he/LC_MESSAGES/goobox.mo
 share/locale/hu/LC_MESSAGES/goobox.mo
@ -89,3 +100,4 @@ share/locale/tr/LC_MESSAGES/goobox.mo
 share/locale/vi/LC_MESSAGES/goobox.mo
 share/locale/zh_CN/LC_MESSAGES/goobox.mo
 share/locale/zh_TW/LC_MESSAGES/goobox.mo
+share/metainfo/org.gnome.Goobox.appdata.xml
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	sound-juicer
-PORTVERSION=	3.24.0
+PORTVERSION=	3.38.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@ -16,29 +16,20 @@ BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libmusicbrainz5.so:audio/libmusicbrainz5 \
 		libdiscid.so:audio/libdiscid \
 		libtag.so:audio/taglib \
-		libcanberra.so:audio/libcanberra \
 		libdbus-glib-1.so:devel/dbus-glib \
-		libbrasero-media3.so:sysutils/brasero
+		libbrasero-media3.so:sysutils/brasero \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3

 PORTSCOUT=	limitw:1,even

-USES=		compiler:c11 desktop-file-utils gettext gmake gnome \
-		pathfix pkgconfig tar:xz
-USE_GNOME=	gnomeprefix intlhack
+USES=		compiler:c11 desktop-file-utils gettext gnome meson \
+		pkgconfig tar:xz
 USE_GSTREAMER1=	cdparanoia flac good vorbis
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-ignore-missing-cd
+USE_GNOME=	gtk30
 INSTALLS_ICONS=	yes
-CFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral
-LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	XDG_CACHE_HOME=${WRKDIR}
 INSTALL_TARGET=	install-strip

 GLIB_SCHEMAS=	org.gnome.sound-juicer.gschema.xml

-post-patch:
-	@${REINPLACE_CMD} -e 's|^\(SUBDIRS = .*\)tests\(.*\)|\1\2|' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|" == "|" = "|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1591948986
-SHA256 (gnome3/sound-juicer-3.24.0.tar.xz) = de6ae3889e60a572221274517a90d29dd21023acf3a94cc9c033270776270fa7
-SIZE (gnome3/sound-juicer-3.24.0.tar.xz) = 1019588
+TIMESTAMP = 1600329567
+SHA256 (gnome3/sound-juicer-3.38.0.tar.xz) = ae375f357a1b8b81e4aff737c9d6c98bc2dadfe20e71754b1d52a79f036aa521
+SIZE (gnome3/sound-juicer-3.38.0.tar.xz) = 1775916
--- a/audio/sound-juicer/files/patch-meson.build
+++ b/audio/sound-juicer/files/patch-meson.build
@ -0,0 +1,11 @@
+--- meson.build.orig	2020-09-12 03:40:20 UTC
+++ meson.build
+@@ -7,7 +7,7 @@ sound_juicer_libdir = join_paths(sound_juicer_prefix, 
+ sound_juicer_libexecdir = join_paths(sound_juicer_prefix, get_option('libexecdir'))
+ sound_juicer_localedir = join_paths(sound_juicer_prefix, get_option('localedir'))
+ 
+-sound_juicer_docdir = join_paths(sound_juicer_prefix, 'doc', meson.project_name())
+sound_juicer_docdir = join_paths(sound_juicer_prefix, 'share/doc', meson.project_name())
+ 
+ gnome = import('gnome')
+ i18n = import('i18n')
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@ -1,95 +1,74 @@
 bin/sound-juicer
 man/man1/sound-juicer.1.gz
 share/GConf/gsettings/sound-juicer.convert
-share/appdata/org.gnome.SoundJuicer.appdata.xml
 share/applications/org.gnome.SoundJuicer.desktop
 share/dbus-1/services/org.gnome.SoundJuicer.service
 share/help/C/sound-juicer/figures/prefs.png
 share/help/C/sound-juicer/figures/startup.png
 share/help/C/sound-juicer/index.docbook
-share/help/C/sound-juicer/legal.xml
 share/help/ar/sound-juicer/figures/prefs.png
 share/help/ar/sound-juicer/figures/startup.png
 share/help/ar/sound-juicer/index.docbook
-share/help/ar/sound-juicer/legal.xml
 share/help/ca/sound-juicer/figures/prefs.png
 share/help/ca/sound-juicer/figures/startup.png
 share/help/ca/sound-juicer/index.docbook
-share/help/ca/sound-juicer/legal.xml
 share/help/cs/sound-juicer/figures/prefs.png
 share/help/cs/sound-juicer/figures/startup.png
 share/help/cs/sound-juicer/index.docbook
-share/help/cs/sound-juicer/legal.xml
 share/help/de/sound-juicer/figures/prefs.png
 share/help/de/sound-juicer/figures/startup.png
 share/help/de/sound-juicer/index.docbook
-share/help/de/sound-juicer/legal.xml
 share/help/el/sound-juicer/figures/prefs.png
 share/help/el/sound-juicer/figures/startup.png
 share/help/el/sound-juicer/index.docbook
-share/help/el/sound-juicer/legal.xml
 share/help/en_GB/sound-juicer/figures/prefs.png
 share/help/en_GB/sound-juicer/figures/startup.png
 share/help/en_GB/sound-juicer/index.docbook
-share/help/en_GB/sound-juicer/legal.xml
 share/help/es/sound-juicer/figures/prefs.png
 share/help/es/sound-juicer/figures/startup.png
 share/help/es/sound-juicer/index.docbook
-share/help/es/sound-juicer/legal.xml
 share/help/eu/sound-juicer/figures/prefs.png
 share/help/eu/sound-juicer/figures/startup.png
 share/help/eu/sound-juicer/index.docbook
-share/help/eu/sound-juicer/legal.xml
 share/help/fr/sound-juicer/figures/prefs.png
 share/help/fr/sound-juicer/figures/startup.png
 share/help/fr/sound-juicer/index.docbook
-share/help/fr/sound-juicer/legal.xml
 share/help/ja/sound-juicer/figures/prefs.png
 share/help/ja/sound-juicer/figures/startup.png
 share/help/ja/sound-juicer/index.docbook
-share/help/ja/sound-juicer/legal.xml
 share/help/nl/sound-juicer/figures/prefs.png
 share/help/nl/sound-juicer/figures/startup.png
 share/help/nl/sound-juicer/index.docbook
-share/help/nl/sound-juicer/legal.xml
 share/help/oc/sound-juicer/figures/prefs.png
 share/help/oc/sound-juicer/figures/startup.png
 share/help/oc/sound-juicer/index.docbook
-share/help/oc/sound-juicer/legal.xml
 share/help/pl/sound-juicer/figures/prefs.png
 share/help/pl/sound-juicer/figures/startup.png
 share/help/pl/sound-juicer/index.docbook
-share/help/pl/sound-juicer/legal.xml
 share/help/pt_BR/sound-juicer/figures/prefs.png
 share/help/pt_BR/sound-juicer/figures/startup.png
 share/help/pt_BR/sound-juicer/index.docbook
-share/help/pt_BR/sound-juicer/legal.xml
 share/help/ru/sound-juicer/figures/prefs.png
 share/help/ru/sound-juicer/figures/startup.png
 share/help/ru/sound-juicer/index.docbook
-share/help/ru/sound-juicer/legal.xml
 share/help/sl/sound-juicer/figures/prefs.png
 share/help/sl/sound-juicer/figures/startup.png
 share/help/sl/sound-juicer/index.docbook
-share/help/sl/sound-juicer/legal.xml
 share/help/sv/sound-juicer/figures/prefs.png
 share/help/sv/sound-juicer/figures/startup.png
 share/help/sv/sound-juicer/index.docbook
-share/help/sv/sound-juicer/legal.xml
 share/help/uk/sound-juicer/figures/prefs.png
 share/help/uk/sound-juicer/figures/startup.png
 share/help/uk/sound-juicer/index.docbook
-share/help/uk/sound-juicer/legal.xml
 share/help/zh_CN/sound-juicer/figures/prefs.png
 share/help/zh_CN/sound-juicer/figures/startup.png
 share/help/zh_CN/sound-juicer/index.docbook
-share/help/zh_CN/sound-juicer/legal.xml
-share/icons/hicolor/16x16/apps/sound-juicer.png
-share/icons/hicolor/22x22/apps/sound-juicer.png
-share/icons/hicolor/24x24/apps/sound-juicer.png
-share/icons/hicolor/256x256/apps/sound-juicer.png
-share/icons/hicolor/32x32/apps/sound-juicer.png
-share/icons/hicolor/48x48/apps/sound-juicer.png
+share/icons/hicolor/16x16/apps/org.gnome.SoundJuicer.png
+share/icons/hicolor/22x22/apps/org.gnome.SoundJuicer.png
+share/icons/hicolor/24x24/apps/org.gnome.SoundJuicer.png
+share/icons/hicolor/256x256/apps/org.gnome.SoundJuicer.png
+share/icons/hicolor/32x32/apps/org.gnome.SoundJuicer.png
+share/icons/hicolor/48x48/apps/org.gnome.SoundJuicer.png
 share/locale/ar/LC_MESSAGES/sound-juicer.mo
 share/locale/as/LC_MESSAGES/sound-juicer.mo
 share/locale/ast/LC_MESSAGES/sound-juicer.mo
@ -119,6 +98,7 @@ share/locale/eu/LC_MESSAGES/sound-juicer.mo
 share/locale/fa/LC_MESSAGES/sound-juicer.mo
 share/locale/fi/LC_MESSAGES/sound-juicer.mo
 share/locale/fr/LC_MESSAGES/sound-juicer.mo
+share/locale/fur/LC_MESSAGES/sound-juicer.mo
 share/locale/ga/LC_MESSAGES/sound-juicer.mo
 share/locale/gl/LC_MESSAGES/sound-juicer.mo
 share/locale/gu/LC_MESSAGES/sound-juicer.mo
@ -172,4 +152,9 @@ share/locale/xh/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_HK/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
+share/metainfo/org.gnome.SoundJuicer.metainfo.xml
 %%DATADIR%%/rhythmbox.gep
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README.md
--- a/audio/zrythm/Makefile
+++ b/audio/zrythm/Makefile
@ -2,8 +2,7 @@

 PORTNAME=	zrythm
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.911
-PORTREVISION=	2
+DISTVERSION=	0.8.982
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/zrythm/distinfo
+++ b/audio/zrythm/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1599106079
-SHA256 (zrythm-zrythm-v0.8.911_GH0.tar.gz) = 7804f44dc1e780b1fb34d7f614dc491608436e01707744ca6c44939311994dbe
-SIZE (zrythm-zrythm-v0.8.911_GH0.tar.gz) = 13388324
+TIMESTAMP = 1600327064
+SHA256 (zrythm-zrythm-v0.8.982_GH0.tar.gz) = 73a63bbc636c780e7ddf86830601ea39546a4c9747d49438b74bc4cae2c4814d
+SIZE (zrythm-zrythm-v0.8.982_GH0.tar.gz) = 13434784
--- a/audio/zrythm/files/patch-meson.build
+++ b/audio/zrythm/files/patch-meson.build
@ -1,26 +0,0 @@
-Workaround for the bug in meson.build: fftw3_threads and fftw3f_threads libraries aren't returned by pkg-config
-
--- meson.build.orig	2020-06-06 18:03:44 UTC
-+++ meson.build
-@@ -638,8 +638,8 @@ zrythm_deps = [
-   gtksource_dep,
- 
-   # these are needed for gentoo
-  dependency('fftw3_threads', required: false),
-  dependency('fftw3f_threads', required: false),
-+  #dependency('fftw3_threads', required: false),
-+  #dependency('fftw3f_threads', required: false),
- 
-   libm,
- ]
-@@ -652,8 +652,8 @@ if os_windows
- endif
- 
- # for mingw on arch linux
-zrythm_deps += cc.find_library('fftw3_threads', required: false)
-zrythm_deps += cc.find_library('fftw3f_threads', required: false)
-+#zrythm_deps += cc.find_library('fftw3_threads', required: false)
-+#zrythm_deps += cc.find_library('fftw3f_threads', required: false)
- 
- if os_gnu
-   zrythm_deps += cc.find_library('rt')
--- a/audio/zrythm/pkg-plist
+++ b/audio/zrythm/pkg-plist
@ -46,7 +46,7 @@ share/mime/packages/org.zrythm.Zrythm-mime.xml
 %%DATADIR%%/samples/square_normal.wav
 %%DATADIR%%/sourceview-styles/monokai-extended-zrythm.xml
 %%DATADIR%%/themes/icons/zrythm-dark/index.theme
-%%DATADIR%%/themes/icons/zrythm-dark/scalable/README
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/README.md
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/actions/add.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/actions/arrow-down-small.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/actions/arrow-up-small.svg
@ -87,6 +87,7 @@ share/mime/packages/org.zrythm.Zrythm-mime.xml
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/actions/insert-silence.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/actions/instrument.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/actions/listen.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/actions/markers.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/actions/media-loop.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/actions/media-playback-start.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/actions/media-playback-stop.svg
@ -153,12 +154,26 @@ share/mime/packages/org.zrythm.Zrythm-mime.xml
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/mimetypes/logo-ladspa.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/mimetypes/logo-lv2.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/mimetypes/logo-vst.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/status/articulation-legato.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/status/articulation-portato.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/status/articulation-staccato.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/status/articulation-staccato2.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/status/audio-volume-high.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/status/augmentation-dot.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/status/bars.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/status/data-warning.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/status/drum-flam.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/status/dynamics-crescendo.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/status/image-missing.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/status/jack-timebase-master.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/status/jack-transport-client.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/status/signal-audio.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/status/signal-cv.svg
 %%DATADIR%%/themes/icons/zrythm-dark/scalable/status/signal-midi.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/status/strum.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/tracktypes/bars.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/tracktypes/bus.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/tracktypes/markers.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/tracktypes/signal-audio.svg
+%%DATADIR%%/themes/icons/zrythm-dark/scalable/tracktypes/signal-midi.svg
 %%DATADIR%%/themes/zrythm-theme.css
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@ -38,6 +38,7 @@
    SUBDIR += iperf3
    SUBDIR += libcelero
    SUBDIR += libmicro
+    SUBDIR += linux-gputest
    SUBDIR += linux-vdbench
    SUBDIR += lmbench
    SUBDIR += lzbench
--- a/benchmarks/linux-gputest/Makefile
+++ b/benchmarks/linux-gputest/Makefile
@ -0,0 +1,73 @@
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	gputest
+PORTVERSION=	0.7.0
+CATEGORIES=	benchmarks linux
+MASTER_SITES=	http://vault.101011010.xyz/distfiles/ \
+		http://freebsd.nsu.ru/distfiles/ LOCAL/danfe
+		# http://www.ozone3d.net/gputest/dl/ (original
+		# upstream URL, but they ask not to hotlink)
+DISTNAME=	GpuTest_Linux_x64_${PORTVERSION}
+PKGNAMEPREFIX=	linux-
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	GPU stress test and OpenGL benchmark
+
+LICENSE=	GEEKS3D
+LICENSE_NAME=	Geeks3D End-User License Agreement
+LICENSE_FILE=	${WRKSRC}/EULA.txt
+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
+
+ONLY_FOR_ARCHS=	amd64
+
+USES=		linux zip
+USE_LINUX=	dri libglvnd xorglibs
+NO_BUILD=	yes
+
+OPTIONS_DEFINE=	DOCS GUI
+OPTIONS_DEFAULT=	GUI
+OPTIONS_SUB=	yes
+
+GUI_DESC=	Install Python/Tkinter-based GUI launcher
+GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
+GUI_USES=	python:run
+
+post-patch:
+	@${REINPLACE_CMD} -e '1s,bash,sh,' ${WRKSRC}/start_*.sh
+	@${RM} ${WRKSRC}/data/.DS_Store
+# Save log file in writable location instead of ${PREFIX}/lib/${PORTNAME}
+	@${REINPLACE_CMD} -e \
+	    's,_geeks3d_gputest_log\.txt,/tmp/geeks3d_gputest.log,' \
+		${WRKSRC}/GpuTest
+
+# We cannot just embed shebang line in the patch because 210:fix-shebang
+# happens before 500:do-patch :(
+post-patch-GUI-on:
+	@${REINPLACE_CMD} -e '1 { x; s,^,#!${PYTHON_CMD},; G; }' \
+		${WRKSRC}/gputest_gui.py
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} data \
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	${INSTALL_LIB} ${WRKSRC}/*.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/GpuTest \
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/start_*.sh \
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/_geeks3d_gputest_scores.csv \
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	${PRINTF} '#!/bin/sh\n\ncd ${PREFIX}/lib/${PORTNAME} || exit\
+		1\n\nexec ./GpuTest "$$@"\n' > \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+do-install-GUI-on:
+	${INSTALL_SCRIPT} ${WRKSRC}/gputest_gui.py ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
--- a/benchmarks/linux-gputest/distinfo
+++ b/benchmarks/linux-gputest/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1393924825
+SHA256 (GpuTest_Linux_x64_0.7.0.zip) = a6cbddfb40dc203735d63bc9609b24abde8613fbb649d0ef7d0d4515842ba263
+SIZE (GpuTest_Linux_x64_0.7.0.zip) = 2083164
--- a/benchmarks/linux-gputest/files/patch-gputest__gui.py
+++ b/benchmarks/linux-gputest/files/patch-gputest__gui.py
@ -0,0 +1,29 @@
+--- gputest_gui.py.orig	2014-03-04 02:16:44 UTC
+++ gputest_gui.py
+@@ -7,7 +7,7 @@
+ 
+ import os
+ #from subprocess import call
+-import Tkinter as tk
+import tkinter as tk
+ 
+ 
+ root = tk.Tk()
+@@ -90,7 +90,7 @@ def prepare_command_line():
+     index = cs[0]
+     seltext = listbox1.get(index)
+   else:
+-    print "\nPlease select a test (FurMark is the default test)."
+    print("\nPlease select a test (FurMark is the default test).")
+     index = 0
+     seltext = listbox1.get(index)
+   
+@@ -98,7 +98,7 @@ def prepare_command_line():
+   for demo in allDemos:
+     if demo.demo_name == seltext:
+       demo_code = demo.demo_code
+-  g_command_line = "./GpuTest /test='%s' /width=%d /height=%d /gpumon_terminal" % (demo_code, g_width, g_height)
+  g_command_line = "gputest /test='%s' /width=%d /height=%d /gpumon_terminal" % (demo_code, g_width, g_height)
+   if (fullscreen.get() == 1):
+     g_command_line += " /fullscreen"
+     
--- a/benchmarks/linux-gputest/pkg-descr
+++ b/benchmarks/linux-gputest/pkg-descr
@ -0,0 +1,9 @@
+GpuTest is a cross-platform GPU stress test and benchmarking utility, based
+on OpenGL.  It comes with a number of different tests, including the famous
+stress test based on FurMark (OpenGL 2.1 or 3.2), a tessellation test based
+on TessMark (OpenGL 4.0), and geometry instancing test (OpenGL 3.3).
+
+An optional GUI (graphical user interface) program made with Python/Tkinter
+is available since GpuTest version 0.6.0.
+
+WWW: http://www.Geeks3D.com/GpuTest/
--- a/benchmarks/linux-gputest/pkg-plist
+++ b/benchmarks/linux-gputest/pkg-plist
@ -0,0 +1,38 @@
+bin/gputest
+%%GUI%%bin/gputest_gui.py
+lib/gputest/GpuTest
+lib/gputest/_geeks3d_gputest_scores.csv
+lib/gputest/data/_bg.jpg
+lib/gputest/data/_fur.jpg
+lib/gputest/data/apple_logo.jpg
+lib/gputest/data/bg.jpg
+lib/gputest/data/bg02.jpg
+lib/gputest/data/bg02_.jpg
+lib/gputest/data/bg08.jpg
+lib/gputest/data/bg09.jpg
+lib/gputest/data/fur.jpg
+lib/gputest/data/linux_logo.jpg
+lib/gputest/data/piano_texture.jpg
+lib/gputest/data/piano_texture_01.jpg
+lib/gputest/data/tess_bump.jpg
+lib/gputest/data/tess_diffuse.jpg
+lib/gputest/data/tess_normal.jpg
+lib/gputest/data/windows_logo.jpg
+lib/gputest/libgxl3d_r_linux.so
+lib/gputest/plugin_gxl3d_gpu_monitor_gml_x64.so
+lib/gputest/plugin_gxl3d_opencl_x64.so
+lib/gputest/start_furmark_benchmark_fullscreen_1920x1080.sh
+lib/gputest/start_furmark_windowed_1024x640.sh
+lib/gputest/start_gimark_benchmark_fullscreen_1920x1080.sh
+lib/gputest/start_gimark_windowed_1024x640.sh
+lib/gputest/start_pixmark_piano_benchmark_fullscreen_1920x1080.sh
+lib/gputest/start_pixmark_piano_windowed_1024x640.sh
+lib/gputest/start_pixmark_volplosion_benchmark_fullscreen_1920x1080.sh
+lib/gputest/start_pixmark_volplosion_windowed_1024x640.sh
+lib/gputest/start_plot3d_benchmark_fullscreen_1920x1080.sh
+lib/gputest/start_plot3d_windowed_1024x640.sh
+lib/gputest/start_tessmark_benchmark_fullscreen_1920x1080.sh
+lib/gputest/start_tessmark_windowed_1024x640.sh
+lib/gputest/start_triangle_benchmark_fullscreen_1920x1080.sh
+lib/gputest/start_triangle_windowed_1024x640.sh
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
--- a/biology/subread/Makefile
+++ b/biology/subread/Makefile
@ -18,6 +18,7 @@ USES=		gmake localbase:ldflags

 MAKEFILE=	${FILESDIR}/Makefile.pkg
 WRKSRC_SUBDIR=	src
+CFLAGS+=	-fcommon
 INSTALL_TARGET=	install-strip

 .include <bsd.port.mk>
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cego
-PORTVERSION=	2.45.19
+PORTVERSION=	2.45.23
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/

--- a/databases/cego/distinfo
+++ b/databases/cego/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1598268804
-SHA256 (cego-2.45.19.tar.gz) = e127118a023d9bc3fd5e48ef2dc146b03600b0f94bf56aa3310c21df0c002ecf
-SIZE (cego-2.45.19.tar.gz) = 3154770
+TIMESTAMP = 1600327409
+SHA256 (cego-2.45.23.tar.gz) = 0932db50951a83674da306f3066bdf1f667de46408f7153fec7c555465e51718
+SIZE (cego-2.45.23.tar.gz) = 3156665
--- a/databases/percona56-client/files/patch-extra_CMakeLists.txt
+++ b/databases/percona56-client/files/patch-extra_CMakeLists.txt
@ -1,17 +1,16 @@
--- extra/CMakeLists.txt.orig	2016-03-03 15:27:37.000000000 +0200
-+++ extra/CMakeLists.txt	2016-03-10 21:04:51.367091216 +0200
-@@ -59,7 +59,7 @@
-   ADD_DEPENDENCIES(GenError copy_openssl_extra)
- ENDIF()
+--- extra/CMakeLists.txt.orig	2020-07-21 12:31:43.000000000 +0200
+++ extra/CMakeLists.txt	2020-09-17 22:40:42.442794000 +0200
+@@ -58,6 +58,7 @@
+                   ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys 
+                   ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt)
 
-
 +IF(FALSE)
 MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
+ TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
 SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -98,10 +98,13 @@
-   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
+@@ -97,10 +98,13 @@
   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
+   ADD_DEPENDENCIES(innochecksum GenError)
 ENDIF()
 +ENDIF()
 
--- a/databases/percona56-client/files/patch-vio_viosslfactories.c
+++ b/databases/percona56-client/files/patch-vio_viosslfactories.c
@ -1,11 +1,20 @@
--- vio/viosslfactories.c.orig	2018-01-17 11:42:33.764076000 +0000
-+++ vio/viosslfactories.c	2018-01-17 11:43:21.072238000 +0000
-@@ -125,7 +125,7 @@
-   {
-     BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-     BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+--- vio/viosslfactories.c.orig	2020-07-21 12:31:43.000000000 +0200
+++ vio/viosslfactories.c	2020-09-17 22:38:47.837385000 +0200
+@@ -128,7 +128,7 @@
+     BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
+     BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
+     if (!p || !g
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
+         || !DH_set0_pqg(dh, p, NULL, g)
+ #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+     ) {
+@@ -136,7 +136,7 @@
+       DH_free(dh);
+       return NULL;
+     }
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
     dh->p= p;
     dh->g= g;
-     if (! dh->p || ! dh->g)
+ #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
--- a/databases/percona56-server/Makefile
+++ b/databases/percona56-server/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME?=	percona
-DISTVERSION=	5.6.45-86.1
+DISTVERSION=	5.6.49-89.0
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
@ -95,6 +95,9 @@ CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"

 .include <bsd.port.options.mk>

+# Workaround to clang11/gcc10 with -fno-common by default
+CFLAGS+=        -fcommon
+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
 SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
 .else
--- a/databases/percona56-server/distinfo
+++ b/databases/percona56-server/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1566412174
-SHA256 (percona-server-5.6.45-86.1.tar.gz) = 0c4d1541b4e4292d48f9fe25a7f39a6c46a85beb0f9bb4693d776f44c16a068c
-SIZE (percona-server-5.6.45-86.1.tar.gz) = 53178072
+TIMESTAMP = 1600374476
+SHA256 (percona-server-5.6.49-89.0.tar.gz) = 279908e35cd29e64ad89a36ac49f61576b312790629ae99fddf2781b05981827
+SIZE (percona-server-5.6.49-89.0.tar.gz) = 53087825
--- a/databases/percona56-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/percona56-server/files/patch-libmysql_CMakeLists.txt
@ -1,15 +1,15 @@
--- libmysql/CMakeLists.txt.orig	2014-03-15 18:08:38.000000000 +0100
-+++ libmysql/CMakeLists.txt	2014-03-22 19:48:26.793800547 +0100
-@@ -180,7 +180,7 @@
+--- libmysql/CMakeLists.txt.orig
+++ libmysql/CMakeLists.txt
+@@ -205,7 +205,7 @@
 ENDIF()
 
 # Merge several convenience libraries into one big perconaserverclient
-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
+-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
+ TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK})
 
 # Visual Studio users need debug  static library for debug projects
- INSTALL_DEBUG_SYMBOLS(clientlib)
-@@ -195,6 +195,7 @@
+@@ -220,6 +220,7 @@
   SET(${out_name} ${name})
 ENDMACRO()
 
@ -17,7 +17,7 @@
 IF(UNIX)
   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
     SET(DOT_VERSION ".${VERSION}")
-@@ -215,13 +216,15 @@
+@@ -240,14 +241,16 @@
     ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
     ${INSTALL_LIBDIR} Development)
 ENDIF()
@ -26,16 +26,18 @@
 IF(NOT DISABLE_SHARED)
   # Merge several convenience libraries into one big perconaserverclient
   # and link them together into shared library.
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+   MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
     EXPORTS ${CLIENT_API_FUNCTIONS}
 -    COMPONENT SharedLibraries)
 +    COMPONENT SharedLibraries NOINSTALL)
+   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
 +IF(FALSE)
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -281,3 +284,4 @@
+@@ -316,4 +319,5 @@
+         ${INSTALL_LIBDIR} SharedLibraries)
     ENDFOREACH()
   ENDIF()
- ENDIF()
 +ENDIF()
+ ENDIF()
--- a/databases/percona56-server/files/patch-sql_mysqld.cc
+++ b/databases/percona56-server/files/patch-sql_mysqld.cc
@ -17,12 +17,3 @@
 static void set_proxy()
 {
   const char *p;
-@@ -4685,7 +4695,7 @@ static void openssl_lock(int mode, opens
- static int init_ssl()
- {
- #ifdef HAVE_OPENSSL
-#ifndef HAVE_YASSL
-+#if !defined(HAVE_YASSL) && defined(OPENSSL_FIPS)
-   int fips_mode= FIPS_mode();
-   if (fips_mode != 0)
-   {
--- a/databases/percona56-server/files/patch-vio_viosslfactories.c
+++ b/databases/percona56-server/files/patch-vio_viosslfactories.c
@ -1,11 +1,20 @@
--- vio/viosslfactories.c.orig	2018-01-17 11:42:33.764076000 +0000
-+++ vio/viosslfactories.c	2018-01-17 11:43:21.072238000 +0000
-@@ -125,7 +125,7 @@
-   {
-     BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-     BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+--- vio/viosslfactories.c.orig	2020-07-21 12:31:43.000000000 +0200
+++ vio/viosslfactories.c	2020-09-17 22:38:47.837385000 +0200
+@@ -128,7 +128,7 @@
+     BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
+     BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
+     if (!p || !g
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
+         || !DH_set0_pqg(dh, p, NULL, g)
+ #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+     ) {
+@@ -136,7 +136,7 @@
+       DH_free(dh);
+       return NULL;
+     }
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
     dh->p= p;
     dh->g= g;
-     if (! dh->p || ! dh->g)
+ #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
--- a/databases/percona56-server/pkg-plist
+++ b/databases/percona56-server/pkg-plist
@ -34,6 +34,7 @@ lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/connection_control.so
 lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/ha_example.so
 %%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
 lib/mysql/plugin/handlersocket.so
 %%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so
--- a/deskutils/baobab/Makefile
+++ b/deskutils/baobab/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	baobab
-PORTVERSION=	3.34.0
+PORTVERSION=	3.38.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
--- a/deskutils/baobab/distinfo
+++ b/deskutils/baobab/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1591949577
-SHA256 (gnome/baobab-3.34.0.tar.xz) = 46ebd9466da6a68c340653e9095f1e905b6fac79305879a9e644634f7da98607
-SIZE (gnome/baobab-3.34.0.tar.xz) = 454960
+TIMESTAMP = 1600328352
+SHA256 (gnome/baobab-3.38.0.tar.xz) = 048468147860816b97f15d50b3c84e9acf0539c1441cfeb63703d112e8728329
+SIZE (gnome/baobab-3.38.0.tar.xz) = 579948
--- a/deskutils/baobab/pkg-plist
+++ b/deskutils/baobab/pkg-plist
@ -275,6 +275,19 @@ share/help/sv/baobab/scan-file-system.page
 share/help/sv/baobab/scan-folder.page
 share/help/sv/baobab/scan-home.page
 share/help/sv/baobab/scan-remote.page
+share/help/uk/baobab/index.page
+share/help/uk/baobab/introduction.page
+share/help/uk/baobab/legal.xml
+share/help/uk/baobab/media/hicolor_apps_48x48_baobab.png
+share/help/uk/baobab/pref-view-chart.page
+share/help/uk/baobab/problem-permissions.page
+share/help/uk/baobab/problem-slow-scan.page
+share/help/uk/baobab/question-open-folder.page
+share/help/uk/baobab/question-trash.page
+share/help/uk/baobab/scan-file-system.page
+share/help/uk/baobab/scan-folder.page
+share/help/uk/baobab/scan-home.page
+share/help/uk/baobab/scan-remote.page
 share/help/zh_CN/baobab/index.page
 share/help/zh_CN/baobab/introduction.page
 share/help/zh_CN/baobab/legal.xml
@ -288,6 +301,7 @@ share/help/zh_CN/baobab/scan-file-system.page
 share/help/zh_CN/baobab/scan-folder.page
 share/help/zh_CN/baobab/scan-home.page
 share/help/zh_CN/baobab/scan-remote.page
+share/icons/hicolor/scalable/apps/org.gnome.baobab.Devel.svg
 share/icons/hicolor/scalable/apps/org.gnome.baobab.svg
 share/icons/hicolor/symbolic/apps/org.gnome.baobab-symbolic.svg
 share/locale/af/LC_MESSAGES/baobab.mo
@ -306,6 +320,7 @@ share/locale/br/LC_MESSAGES/baobab.mo
 share/locale/bs/LC_MESSAGES/baobab.mo
 share/locale/ca/LC_MESSAGES/baobab.mo
 share/locale/ca@valencia/LC_MESSAGES/baobab.mo
+share/locale/ckb/LC_MESSAGES/baobab.mo
 share/locale/crh/LC_MESSAGES/baobab.mo
 share/locale/cs/LC_MESSAGES/baobab.mo
 share/locale/cy/LC_MESSAGES/baobab.mo
--- a/deskutils/gnome-documents/Makefile
+++ b/deskutils/gnome-documents/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gnome-documents
-PORTVERSION=	3.28.2
-PORTREVISION=	2
+PORTVERSION=	3.34.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@ -38,7 +37,6 @@ USE_LDCONFIG=	yes
 BINARY_ALIAS=	python3=${PYTHON_VERSION}

 GLIB_SCHEMAS=	org.gnome.Documents.enums.xml \
-		org.gnome.books.gschema.xml \
 		org.gnome.documents.gschema.xml

 .include <bsd.port.mk>
--- a/deskutils/gnome-documents/distinfo
+++ b/deskutils/gnome-documents/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1538670100
-SHA256 (gnome3/gnome-documents-3.28.2.tar.xz) = 58f2ee1cf0967848e6e1dd37d4b6bcb6bc17b14379922aad344fbe34b0b55629
-SIZE (gnome3/gnome-documents-3.28.2.tar.xz) = 4800076
+TIMESTAMP = 1591950385
+SHA256 (gnome3/gnome-documents-3.34.0.tar.xz) = d8a90e84aef3a78fcaa91dc12a24a473a5778a47eb4c2354d0e35d558f29f0e2
+SIZE (gnome3/gnome-documents-3.34.0.tar.xz) = 914100
--- a/deskutils/gnome-documents/files/patch-meson.build
+++ b/deskutils/gnome-documents/files/patch-meson.build
@ -0,0 +1,13 @@
+--- meson.build.orig	2019-10-24 07:35:24 UTC
+++ meson.build
+@@ -29,10 +29,6 @@ documents_pkglibdir = join_paths(documents_libdir, mes
+ 
+ documents_schemadir = join_paths(documents_datadir, 'glib-2.0', 'schemas')
+ 
+-if not get_option('buildtype').contains('plain')
+-  run_command('git', '-C', meson.source_root(), 'submodule', 'update', '--init', '--recursive')
+-endif
+-
+ cc = meson.get_compiler('c')
+ 
+ config_h = configuration_data()
--- a/deskutils/gnome-documents/pkg-plist
+++ b/deskutils/gnome-documents/pkg-plist
@ -1,20 +1,13 @@
-bin/gnome-books
 bin/gnome-documents
 lib/gnome-documents/girepository-1.0/Gd-1.0.typelib
 lib/gnome-documents/girepository-1.0/GdPrivate-1.0.typelib
 lib/gnome-documents/libgd.so
 lib/gnome-documents/libgdprivate-1.0.so
-man/man1/gnome-books.1.gz
 man/man1/gnome-documents.1.gz
-share/applications/org.gnome.Books.desktop
 share/applications/org.gnome.Documents.desktop
-share/dbus-1/services/org.gnome.Books.service
 share/dbus-1/services/org.gnome.Documents.service
 %%DATADIR%%/gir-1.0/Gd-1.0.gir
 %%DATADIR%%/gir-1.0/GdPrivate-1.0.gir
-%%DATADIR%%/org.gnome.Books
-%%DATADIR%%/org.gnome.Books.data.gresource
-%%DATADIR%%/org.gnome.Books.src.gresource
 %%DATADIR%%/org.gnome.Documents
 %%DATADIR%%/org.gnome.Documents.data.gresource
 %%DATADIR%%/org.gnome.Documents.src.gresource
@ -514,22 +507,8 @@ share/help/zh_CN/gnome-documents/search.page
 share/help/zh_CN/gnome-documents/view-add.page
 share/help/zh_CN/gnome-documents/view.page
 share/help/zh_CN/gnome-documents/viewgrid.page
-share/icons/hicolor/16x16/apps/org.gnome.Books.png
-share/icons/hicolor/16x16/apps/org.gnome.Documents.png
-share/icons/hicolor/22x22/apps/org.gnome.Books.png
-share/icons/hicolor/22x22/apps/org.gnome.Documents.png
-share/icons/hicolor/24x24/apps/org.gnome.Books.png
-share/icons/hicolor/24x24/apps/org.gnome.Documents.png
-share/icons/hicolor/256x256/apps/org.gnome.Books.png
-share/icons/hicolor/256x256/apps/org.gnome.Documents.png
-share/icons/hicolor/32x32/apps/org.gnome.Books.png
-share/icons/hicolor/32x32/apps/org.gnome.Documents.png
-share/icons/hicolor/48x48/apps/org.gnome.Books.png
-share/icons/hicolor/48x48/apps/org.gnome.Documents.png
-share/icons/hicolor/512x512/apps/org.gnome.Books.png
-share/icons/hicolor/512x512/apps/org.gnome.Documents.png
-share/icons/hicolor/scalable/apps/org.gnome.Books-symbolic.svg
-share/icons/hicolor/scalable/apps/org.gnome.Documents-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Documents.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Documents-symbolic.svg
 share/locale/af/LC_MESSAGES/gnome-documents.mo
 share/locale/ar/LC_MESSAGES/gnome-documents.mo
 share/locale/as/LC_MESSAGES/gnome-documents.mo
@ -569,6 +548,7 @@ share/locale/ko/LC_MESSAGES/gnome-documents.mo
 share/locale/ln/LC_MESSAGES/gnome-documents.mo
 share/locale/lt/LC_MESSAGES/gnome-documents.mo
 share/locale/lv/LC_MESSAGES/gnome-documents.mo
+share/locale/mjw/LC_MESSAGES/gnome-documents.mo
 share/locale/mk/LC_MESSAGES/gnome-documents.mo
 share/locale/ml/LC_MESSAGES/gnome-documents.mo
 share/locale/mr/LC_MESSAGES/gnome-documents.mo
@ -600,5 +580,4 @@ share/locale/xh/LC_MESSAGES/gnome-documents.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-documents.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-documents.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-documents.mo
-share/metainfo/org.gnome.Books.appdata.xml
 share/metainfo/org.gnome.Documents.appdata.xml
--- a/deskutils/gnome-screenshot/Makefile
+++ b/deskutils/gnome-screenshot/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gnome-screenshot
-PORTVERSION=	3.26.0
+PORTVERSION=	3.38.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@ -15,12 +15,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 BUILD_DEPENDS=	appstream-builder:devel/appstream-glib
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
-		libcanberra-gtk3.so:audio/libcanberra-gtk3
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libhandy-1.so:x11-toolkits/libhandy

 CONFLICTS=	gnome-utils-2.[0-9]*
 PORTSCOUT=	limitw:1,even

-USES=		gettext gnome localbase meson pkgconfig python:3.4+,build \
+USES=		gettext gnome meson pkgconfig python:3.4+,build \
 		shebangfix tar:xz xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_XORG=	x11 xext
--- a/deskutils/gnome-screenshot/distinfo
+++ b/deskutils/gnome-screenshot/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1516298251
-SHA256 (gnome3/gnome-screenshot-3.26.0.tar.xz) = 1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb
-SIZE (gnome3/gnome-screenshot-3.26.0.tar.xz) = 227432
+TIMESTAMP = 1600341681
+SHA256 (gnome3/gnome-screenshot-3.38.0.tar.xz) = e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0
+SIZE (gnome3/gnome-screenshot-3.38.0.tar.xz) = 356716
--- a/deskutils/gnome-screenshot/files/extra-patch-intel
+++ b/deskutils/gnome-screenshot/files/extra-patch-intel
@ -1,20 +0,0 @@
--- src/screenshot-utils.c.orig	2016-07-11 14:55:18 UTC
-+++ src/screenshot-utils.c
-@@ -630,6 +630,9 @@ screenshot_get_pixbuf (GdkRectangle *rec
-                                      filename);
-     }
- 
-+  if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "GNOME"))
-+      screenshot = screenshot_fallback_get_pixbuf (rectangle);
-+  else {
-   connection = g_application_get_dbus_connection (g_application_get_default ());
-   g_dbus_connection_call_sync (connection,
-                                "org.gnome.Shell.Screenshot",
-@@ -659,6 +662,7 @@ screenshot_get_pixbuf (GdkRectangle *rec
- 
-       screenshot = screenshot_fallback_get_pixbuf (rectangle);
-     }
-+  }
- 
-   g_free (path);
-   g_free (tmpname);
--- a/deskutils/gnome-screenshot/files/patch-src_meson.build
+++ b/deskutils/gnome-screenshot/files/patch-src_meson.build
@ -1,11 +0,0 @@
--- src/meson.build.orig	2018-01-18 18:06:07 UTC
-+++ src/meson.build
-@@ -57,7 +57,7 @@ install_data('org.gnome.gnome-screenshot.gschema.xml',
-              install_dir: gnome_screenshot_schemadir)
- 
- install_data('gnome-screenshot.1',
-             install_dir: join_paths(gnome_screenshot_datadir, 'man', 'man1'))
-+             install_dir: join_paths(gnome_screenshot_prefix, 'man', 'man1'))
- 
- install_data('gnome-screenshot.convert',
-              install_dir: join_paths(gnome_screenshot_datadir, 'GConf', 'gsettings'))
--- a/deskutils/gnome-screenshot/pkg-plist
+++ b/deskutils/gnome-screenshot/pkg-plist
@ -1,8 +1,9 @@
 bin/gnome-screenshot
 man/man1/gnome-screenshot.1.gz
-share/GConf/gsettings/gnome-screenshot.convert
 share/applications/org.gnome.Screenshot.desktop
 share/dbus-1/services/org.gnome.Screenshot.service
+share/icons/hicolor/scalable/apps/org.gnome.Screenshot.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Screenshot-symbolic.svg
 share/locale/af/LC_MESSAGES/gnome-screenshot.mo
 share/locale/am/LC_MESSAGES/gnome-screenshot.mo
 share/locale/an/LC_MESSAGES/gnome-screenshot.mo
@ -19,6 +20,7 @@ share/locale/br/LC_MESSAGES/gnome-screenshot.mo
 share/locale/bs/LC_MESSAGES/gnome-screenshot.mo
 share/locale/ca/LC_MESSAGES/gnome-screenshot.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ckb/LC_MESSAGES/gnome-screenshot.mo
 share/locale/crh/LC_MESSAGES/gnome-screenshot.mo
 share/locale/cs/LC_MESSAGES/gnome-screenshot.mo
 share/locale/cy/LC_MESSAGES/gnome-screenshot.mo
@ -59,6 +61,7 @@ share/locale/lt/LC_MESSAGES/gnome-screenshot.mo
 share/locale/lv/LC_MESSAGES/gnome-screenshot.mo
 share/locale/mai/LC_MESSAGES/gnome-screenshot.mo
 share/locale/mg/LC_MESSAGES/gnome-screenshot.mo
+share/locale/mjw/LC_MESSAGES/gnome-screenshot.mo
 share/locale/mk/LC_MESSAGES/gnome-screenshot.mo
 share/locale/ml/LC_MESSAGES/gnome-screenshot.mo
 share/locale/mn/LC_MESSAGES/gnome-screenshot.mo
--- a/deskutils/py-paperless/Makefile
+++ b/deskutils/py-paperless/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	paperless
 PORTVERSION=	2.7.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

--- a/deskutils/py-paperless/files/paperless.7.in
+++ b/deskutils/py-paperless/files/paperless.7.in
@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 3, 2020
+.Dd September 17, 2020
 .Dt PAPERLESS 7
 .Os
 .Sh NAME
@ -105,79 +105,88 @@ can be tuned in the same configuration file to limit
 the impact on system performance.
 .Pp
 To use paperless, the consumer is enabled
-.Pp
-.Dl "sysrc paperless_consumer_enable=YES"
+.Bd -literal -offset indent
+sysrc paperless_consumer_enable=YES
+.Ed
 .Pp
 and subsequently started
-.Pp
-.Dl "service paperless-consumer start"
+.Bd -literal -offset indent
+service paperless-consumer start
+.Ed
 .Pp
 (which also creates/updates the paperless SQLite database).
 .Pp
 Therefore, restarting the consumer after updates
-.Pp
-.Dl "service paperless-consumer restart"
+.Bd -literal -offset indent
+service paperless-consumer restart
+.Ed
 .Pp
 updates the database before starting the new program version.
 .Sh WEB UI SETUP
 Before using the web ui, make sure to create a super user and assign
 a password
-.Pp
-.Dl "su -l paperless -c '%%PREFIX%%/bin/paperless createsuperuser'"
+.Bd -literal -offset indent
+su -l paperless -c '%%PREFIX%%/bin/paperless createsuperuser'
+.Ed
 .Pp
 It is recommended to host the web component using a real
 web server, e.g., nginx + uwsgi.
 .Pp
 Install and configure uwsgi:
-.Pp
-.Dl "pkg install uwsgi"
-.Dl "mkdir -p %%PREFIX%%/etc/uwsgi"
-.Dl "cp %%EXAMPLESDIR%%/uwsgi.ini \\"
-.Dl "    %%PREFIX%%/etc/uwsgi/paperless.ini"
-.Dl "sysrc uwsgi_enable=YES"
-.Dl "sysrc uwsgi_profiles+=paperless"
-.Dl "sysrc uwsgi_paperless_socket_owner=paperless:www"
-.Dl "sysrc uwsgi_paperless_uid=paperless"
-.Dl "sysrc uwsgi_paperless_gid=paperless"
-.Dl "sysrc uwsgi_paperless_configfile=%%PREFIX%%/etc/uwsgi/paperless.ini"
+.Bd -literal -offset indent
+pkg install uwsgi
+mkdir -p %%PREFIX%%/etc/uwsgi
+cp %%EXAMPLESDIR%%/uwsgi.ini \\
+    %%PREFIX%%/etc/uwsgi/paperless.ini
+sysrc uwsgi_enable=YES
+sysrc uwsgi_profiles+=paperless
+sysrc uwsgi_paperless_socket_owner=paperless:www
+sysrc uwsgi_paperless_uid=paperless
+sysrc uwsgi_paperless_gid=paperless
+sysrc uwsgi_paperless_configfile=%%PREFIX%%/etc/uwsgi/paperless.ini
+.Ed
 .Pp
 Start the uwsgi process:
-.Pp
-.Dl "service uwsgi start paperless"
+.Bd -literal -offset indent
+service uwsgi start paperless
+.Ed
 .Pp
 Install nginx:
-.Pp
-.Dl "pkg install nginx"
+.Bd -literal -offset indent
+pkg install nginx
+.Ed
 .Pp
 Create a basic server configuration (
 .Pa %%PREFIX%%/etc/nginx/nginx.conf
 ), example snippet:
-.Pp
-.Dl "server {"
-.Dl "    listen 80;"
-.Dl "    server_name localhost;"
-.Dl ""
-.Dl "    location /static/ {"
-.Dl "        alias %%WWWDIR%%/static/;"
-.Dl "    }"
-.Dl ""
-.Dl "    location / {"
-.Dl "        uwsgi_pass unix:/tmp/uwsgi-paperless.sock;"
-.Dl "        include uwsgi_params;"
-.Dl "    }"
-.Dl ""
-.Dl "    error_page   500 502 503 504  /50x.html;"
-.Dl "    location = /50x.html {"
-.Dl "        root   %%PREFIX%%/www/nginx-dist;"
-.Dl "    }"
-.Dl "}"
+.Bd -literal -offset indent
+server {
+    listen 80;
+    server_name localhost;
+
+    location /static/ {
+        alias %%WWWDIR%%/static/;
+    }
+
+    location / {
+        uwsgi_pass unix:/tmp/uwsgi-paperless.sock;
+        include uwsgi_params;
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   %%PREFIX%%/www/nginx-dist;
+    }
+}
+.Ed
 .Pp
 Enable and start nginx:
+.Bd -literal -offset indent
+sysrc nginx_enable=YES
+service nginx start
+.Ed
 .Pp
-.Dl "sysrc nginx_enable=YES"
-.Dl "service nginx start"
-.Pp
-.Em \In the real world, nginx should be configured to use TLS
+.Em \In a real world setup, nginx should be configured to use TLS
 .Em and (potentially) client certificates .
 .Sh SFTP SETUP
 Setting up
@ -193,40 +202,45 @@ In case paperless is using a dedicated instance of
 access can be limited to the paperless user by adding
 these lines to
 .Pa /etc/ssh/sshd_config :
-.Pp
-.Dl "# Only include if sshd is dedicated to paperless"
-.Dl "# otherwise you'll lock yourself out"
-.Dl "AllowUsers paperless"
+.Bd -literal -offset indent
+# Only include if sshd is dedicated to paperless
+# otherwise you'll lock yourself out
+AllowUsers paperless
+.Ed
 .Pp
 The following block limits the paperless user to using the
 .Xr sftp 1
 protocol and locks it into the consume directory:
-.Pp
-.Dl "# paperless can only do sftp and is dropped into correct directory"
-.Dl "Match User paperless"
-.Dl "	ChrootDirectory %h/consume"
-.Dl "	ForceCommand internal-sftp -u 0077 -d /input"
-.Dl "	AllowTcpForwarding no"
-.Dl "	X11Forwarding no"
-.Dl "	PasswordAuthentication no"
+.Bd -literal -offset indent
+# paperless can only do sftp and is dropped into correct directory
+Match User paperless
+	ChrootDirectory %h/consume
+	ForceCommand internal-sftp -u 0077 -d /input
+	AllowTcpForwarding no
+	X11Forwarding no
+	PasswordAuthentication no
+.Ed
 .Pp
 The public keys of authorized users/devices need to be added to
 .Pa /var/db/paperless/.ssh/authorized_keys :
-.Pp
-.Dl "mkdir -p /var/db/paperless/.ssh"
-.Dl "cat path/to/pubkey >>/var/db/paperless/.ssh/authorized_keys"
+.Bd -literal -offset indent
+mkdir -p /var/db/paperless/.ssh
+cat path/to/pubkey >>/var/db/paperless/.ssh/authorized_keys
+.Ed
 .Pp
 Make sure
 .Xr sshd 8
 is enabled and restart (or reload) it:
-.Pp
-.Dl "sysrc sshd_enable=YES"
-.Dl "service sshd restart"
+.Bd -literal -offset indent
+sysrc sshd_enable=YES
+service sshd restart
+.Ed
 .Pp
 The user will be dropped into the correct directory, so uploading
 a file is as simple as:
-.Pp
-.Dl "echo put file.pdf | sftp -b - paperless@host"
+.Bd -literal -offset indent
+echo put file.pdf | sftp -b - paperless@host
+.Ed
 .Sh FILES
 .Bl -tag -width ".Pa %%PREFIX%%/etc/paperless.conf" -compact
 .It Pa %%PREFIX%%/etc/paperless.conf
--- a/devel/Makefile
+++ b/devel/Makefile
@ -873,6 +873,7 @@
    SUBDIR += goprotobuf
    SUBDIR += gorm
    SUBDIR += goswagger
+    SUBDIR += got
    SUBDIR += govendor
    SUBDIR += gperf
    SUBDIR += gpm
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@ -12,7 +12,7 @@ COMMENT=	Couple of command line utilities for working with desktop entries
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		gettext meson gnome pkgconfig tar:xz
+USES=		compiler:c11 gettext meson gnome pkgconfig tar:xz
 USE_GNOME=	glib20

 PKGINSTALL=	${WRKDIR}/pkg-install
--- a/devel/got/Makefile
+++ b/devel/got/Makefile
@ -0,0 +1,26 @@
+# $FreeBSD$
+
+PORTNAME=	got
+PORTVERSION=	0.39
+CATEGORIES=	devel
+MASTER_SITES=	https://gameoftrees.org/releases/
+
+MAINTAINER=	naddy@FreeBSD.org
+COMMENT=	Game of Trees version control system
+
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENCE
+
+USES=		uidfix
+
+post-extract:
+	${CP} -R ${FILESDIR}/openbsd-compat ${WRKSRC}
+
+# The regression test suite requires:
+#  installed got
+#  installed git
+#  ssh to 127.0.0.1
+run-test:
+	@(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} regress)
+
+.include <bsd.port.mk>
--- a/devel/got/distinfo
+++ b/devel/got/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1600100495
+SHA256 (got-0.39.tar.gz) = 0169e18c71e9005935e8c6b77ea95f18c49762b98767b7d312a3d24121e39df4
+SIZE (got-0.39.tar.gz) = 440979
--- a/devel/got/files/openbsd-compat/Makefile
+++ b/devel/got/files/openbsd-compat/Makefile
@ -0,0 +1,12 @@
+LIB=	openbsd-compat
+INTERNALLIB=
+
+SRCS=	freezero.c \
+	getdtablecount.c \
+	imsg.c \
+	imsg-buffer.c \
+	recallocarray.c
+
+CFLAGS+= -I${.CURDIR}
+
+.include <bsd.lib.mk>
--- a/devel/got/files/openbsd-compat/endian.h
+++ b/devel/got/files/openbsd-compat/endian.h
@ -0,0 +1,6 @@
+#ifndef _OPENBSD_COMPAT_ENDIAN_H_
+#define _OPENBSD_COMPAT_ENDIAN_H_
+
+#include <sys/endian.h>
+
+#endif
--- a/devel/got/files/openbsd-compat/freezero.c
+++ b/devel/got/files/openbsd-compat/freezero.c
@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+void
+freezero(void *ptr, size_t sz)
+{
+	explicit_bzero(ptr, sz);
+	free(ptr);
+}
--- a/devel/got/files/openbsd-compat/getdtablecount.c
+++ b/devel/got/files/openbsd-compat/getdtablecount.c
@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 2015 Craig Rodrigues
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <stddef.h>
+
+int getdtablecount(void);
+
+/* 
+ * Return the count of open file descriptors for this process.
+ *
+ */
+int
+getdtablecount(void)
+{
+	int mib[4];
+	int error;
+	int nfds;
+	size_t len;
+
+	len = sizeof(nfds);
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_PROC;
+	mib[2] = KERN_PROC_NFDS;
+	mib[3] = 0;
+
+	error = sysctl(mib, 4, &nfds, &len, NULL, 0);
+	if (error)
+		return (-1);
+	return (nfds);
+}
--- a/devel/got/files/openbsd-compat/imsg-buffer.c
+++ b/devel/got/files/openbsd-compat/imsg-buffer.c
@ -0,0 +1,309 @@
+/*	$OpenBSD: imsg-buffer.c,v 1.12 2019/01/20 02:50:03 bcook Exp $	*/
+
+/*
+ * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+
+#include <limits.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "imsg.h"
+
+static int	ibuf_realloc(struct ibuf *, size_t);
+static void	ibuf_enqueue(struct msgbuf *, struct ibuf *);
+static void	ibuf_dequeue(struct msgbuf *, struct ibuf *);
+
+struct ibuf *
+ibuf_open(size_t len)
+{
+	struct ibuf	*buf;
+
+	if ((buf = calloc(1, sizeof(struct ibuf))) == NULL)
+		return (NULL);
+	if ((buf->buf = malloc(len)) == NULL) {
+		free(buf);
+		return (NULL);
+	}
+	buf->size = buf->max = len;
+	buf->fd = -1;
+
+	return (buf);
+}
+
+struct ibuf *
+ibuf_dynamic(size_t len, size_t max)
+{
+	struct ibuf	*buf;
+
+	if (max < len)
+		return (NULL);
+
+	if ((buf = ibuf_open(len)) == NULL)
+		return (NULL);
+
+	if (max > 0)
+		buf->max = max;
+
+	return (buf);
+}
+
+static int
+ibuf_realloc(struct ibuf *buf, size_t len)
+{
+	unsigned char	*b;
+
+	/* on static buffers max is eq size and so the following fails */
+	if (buf->wpos + len > buf->max) {
+		errno = ERANGE;
+		return (-1);
+	}
+
+	b = recallocarray(buf->buf, buf->size, buf->wpos + len, 1);
+	if (b == NULL)
+		return (-1);
+	buf->buf = b;
+	buf->size = buf->wpos + len;
+
+	return (0);
+}
+
+int
+ibuf_add(struct ibuf *buf, const void *data, size_t len)
+{
+	if (buf->wpos + len > buf->size)
+		if (ibuf_realloc(buf, len) == -1)
+			return (-1);
+
+	memcpy(buf->buf + buf->wpos, data, len);
+	buf->wpos += len;
+	return (0);
+}
+
+void *
+ibuf_reserve(struct ibuf *buf, size_t len)
+{
+	void	*b;
+
+	if (buf->wpos + len > buf->size)
+		if (ibuf_realloc(buf, len) == -1)
+			return (NULL);
+
+	b = buf->buf + buf->wpos;
+	buf->wpos += len;
+	return (b);
+}
+
+void *
+ibuf_seek(struct ibuf *buf, size_t pos, size_t len)
+{
+	/* only allowed to seek in already written parts */
+	if (pos + len > buf->wpos)
+		return (NULL);
+
+	return (buf->buf + pos);
+}
+
+size_t
+ibuf_size(struct ibuf *buf)
+{
+	return (buf->wpos);
+}
+
+size_t
+ibuf_left(struct ibuf *buf)
+{
+	return (buf->max - buf->wpos);
+}
+
+void
+ibuf_close(struct msgbuf *msgbuf, struct ibuf *buf)
+{
+	ibuf_enqueue(msgbuf, buf);
+}
+
+int
+ibuf_write(struct msgbuf *msgbuf)
+{
+	struct iovec	 iov[IOV_MAX];
+	struct ibuf	*buf;
+	unsigned int	 i = 0;
+	ssize_t	n;
+
+	memset(&iov, 0, sizeof(iov));
+	TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
+		if (i >= IOV_MAX)
+			break;
+		iov[i].iov_base = buf->buf + buf->rpos;
+		iov[i].iov_len = buf->wpos - buf->rpos;
+		i++;
+	}
+
+again:
+	if ((n = writev(msgbuf->fd, iov, i)) == -1) {
+		if (errno == EINTR)
+			goto again;
+		if (errno == ENOBUFS)
+			errno = EAGAIN;
+		return (-1);
+	}
+
+	if (n == 0) {			/* connection closed */
+		errno = 0;
+		return (0);
+	}
+
+	msgbuf_drain(msgbuf, n);
+
+	return (1);
+}
+
+void
+ibuf_free(struct ibuf *buf)
+{
+	if (buf == NULL)
+		return;
+	freezero(buf->buf, buf->size);
+	free(buf);
+}
+
+void
+msgbuf_init(struct msgbuf *msgbuf)
+{
+	msgbuf->queued = 0;
+	msgbuf->fd = -1;
+	TAILQ_INIT(&msgbuf->bufs);
+}
+
+void
+msgbuf_drain(struct msgbuf *msgbuf, size_t n)
+{
+	struct ibuf	*buf, *next;
+
+	for (buf = TAILQ_FIRST(&msgbuf->bufs); buf != NULL && n > 0;
+	    buf = next) {
+		next = TAILQ_NEXT(buf, entry);
+		if (buf->rpos + n >= buf->wpos) {
+			n -= buf->wpos - buf->rpos;
+			ibuf_dequeue(msgbuf, buf);
+		} else {
+			buf->rpos += n;
+			n = 0;
+		}
+	}
+}
+
+void
+msgbuf_clear(struct msgbuf *msgbuf)
+{
+	struct ibuf	*buf;
+
+	while ((buf = TAILQ_FIRST(&msgbuf->bufs)) != NULL)
+		ibuf_dequeue(msgbuf, buf);
+}
+
+int
+msgbuf_write(struct msgbuf *msgbuf)
+{
+	struct iovec	 iov[IOV_MAX];
+	struct ibuf	*buf;
+	unsigned int	 i = 0;
+	ssize_t		 n;
+	struct msghdr	 msg;
+	struct cmsghdr	*cmsg;
+	union {
+		struct cmsghdr	hdr;
+		char		buf[CMSG_SPACE(sizeof(int))];
+	} cmsgbuf;
+
+	memset(&iov, 0, sizeof(iov));
+	memset(&msg, 0, sizeof(msg));
+	memset(&cmsgbuf, 0, sizeof(cmsgbuf));
+	TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
+		if (i >= IOV_MAX)
+			break;
+		iov[i].iov_base = buf->buf + buf->rpos;
+		iov[i].iov_len = buf->wpos - buf->rpos;
+		i++;
+		if (buf->fd != -1)
+			break;
+	}
+
+	msg.msg_iov = iov;
+	msg.msg_iovlen = i;
+
+	if (buf != NULL && buf->fd != -1) {
+		msg.msg_control = (caddr_t)&cmsgbuf.buf;
+		msg.msg_controllen = sizeof(cmsgbuf.buf);
+		cmsg = CMSG_FIRSTHDR(&msg);
+		cmsg->cmsg_len = CMSG_LEN(sizeof(int));
+		cmsg->cmsg_level = SOL_SOCKET;
+		cmsg->cmsg_type = SCM_RIGHTS;
+		*(int *)CMSG_DATA(cmsg) = buf->fd;
+	}
+
+again:
+	if ((n = sendmsg(msgbuf->fd, &msg, 0)) == -1) {
+		if (errno == EINTR)
+			goto again;
+		if (errno == ENOBUFS)
+			errno = EAGAIN;
+		return (-1);
+	}
+
+	if (n == 0) {			/* connection closed */
+		errno = 0;
+		return (0);
+	}
+
+	/*
+	 * assumption: fd got sent if sendmsg sent anything
+	 * this works because fds are passed one at a time
+	 */
+	if (buf != NULL && buf->fd != -1) {
+		close(buf->fd);
+		buf->fd = -1;
+	}
+
+	msgbuf_drain(msgbuf, n);
+
+	return (1);
+}
+
+static void
+ibuf_enqueue(struct msgbuf *msgbuf, struct ibuf *buf)
+{
+	TAILQ_INSERT_TAIL(&msgbuf->bufs, buf, entry);
+	msgbuf->queued++;
+}
+
+static void
+ibuf_dequeue(struct msgbuf *msgbuf, struct ibuf *buf)
+{
+	TAILQ_REMOVE(&msgbuf->bufs, buf, entry);
+
+	if (buf->fd != -1)
+		close(buf->fd);
+
+	msgbuf->queued--;
+	ibuf_free(buf);
+}
--- a/devel/got/files/openbsd-compat/imsg.c
+++ b/devel/got/files/openbsd-compat/imsg.c
@ -0,0 +1,302 @@
+/*	$OpenBSD: imsg.c,v 1.16 2017/12/14 09:27:44 kettenis Exp $	*/
+
+/*
+ * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "imsg.h"
+
+int	 imsg_fd_overhead = 0;
+
+static int	 imsg_get_fd(struct imsgbuf *);
+
+void
+imsg_init(struct imsgbuf *ibuf, int fd)
+{
+	msgbuf_init(&ibuf->w);
+	memset(&ibuf->r, 0, sizeof(ibuf->r));
+	ibuf->fd = fd;
+	ibuf->w.fd = fd;
+	ibuf->pid = getpid();
+	TAILQ_INIT(&ibuf->fds);
+}
+
+ssize_t
+imsg_read(struct imsgbuf *ibuf)
+{
+	struct msghdr		 msg;
+	struct cmsghdr		*cmsg;
+	union {
+		struct cmsghdr hdr;
+		char	buf[CMSG_SPACE(sizeof(int) * 1)];
+	} cmsgbuf;
+	struct iovec		 iov;
+	ssize_t			 n = -1;
+	int			 fd;
+	struct imsg_fd		*ifd;
+
+	memset(&msg, 0, sizeof(msg));
+	memset(&cmsgbuf, 0, sizeof(cmsgbuf));
+
+	iov.iov_base = ibuf->r.buf + ibuf->r.wpos;
+	iov.iov_len = sizeof(ibuf->r.buf) - ibuf->r.wpos;
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
+	msg.msg_control = &cmsgbuf.buf;
+	msg.msg_controllen = sizeof(cmsgbuf.buf);
+
+	if ((ifd = calloc(1, sizeof(struct imsg_fd))) == NULL)
+		return (-1);
+
+again:
+	if (getdtablecount() + imsg_fd_overhead +
+	    (int)((CMSG_SPACE(sizeof(int))-CMSG_SPACE(0))/sizeof(int))
+	    >= getdtablesize()) {
+		errno = EAGAIN;
+		free(ifd);
+		return (-1);
+	}
+
+	if ((n = recvmsg(ibuf->fd, &msg, 0)) == -1) {
+		if (errno == EINTR)
+			goto again;
+		goto fail;
+	}
+
+	ibuf->r.wpos += n;
+
+	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
+	    cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+		if (cmsg->cmsg_level == SOL_SOCKET &&
+		    cmsg->cmsg_type == SCM_RIGHTS) {
+			int i;
+			int j;
+
+			/*
+			 * We only accept one file descriptor.  Due to C
+			 * padding rules, our control buffer might contain
+			 * more than one fd, and we must close them.
+			 */
+			j = ((char *)cmsg + cmsg->cmsg_len -
+			    (char *)CMSG_DATA(cmsg)) / sizeof(int);
+			for (i = 0; i < j; i++) {
+				fd = ((int *)CMSG_DATA(cmsg))[i];
+				if (ifd != NULL) {
+					ifd->fd = fd;
+					TAILQ_INSERT_TAIL(&ibuf->fds, ifd,
+					    entry);
+					ifd = NULL;
+				} else
+					close(fd);
+			}
+		}
+		/* we do not handle other ctl data level */
+	}
+
+fail:
+	free(ifd);
+	return (n);
+}
+
+ssize_t
+imsg_get(struct imsgbuf *ibuf, struct imsg *imsg)
+{
+	size_t			 av, left, datalen;
+
+	av = ibuf->r.wpos;
+
+	if (IMSG_HEADER_SIZE > av)
+		return (0);
+
+	memcpy(&imsg->hdr, ibuf->r.buf, sizeof(imsg->hdr));
+	if (imsg->hdr.len < IMSG_HEADER_SIZE ||
+	    imsg->hdr.len > MAX_IMSGSIZE) {
+		errno = ERANGE;
+		return (-1);
+	}
+	if (imsg->hdr.len > av)
+		return (0);
+	datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
+	ibuf->r.rptr = ibuf->r.buf + IMSG_HEADER_SIZE;
+	if (datalen == 0)
+		imsg->data = NULL;
+	else if ((imsg->data = malloc(datalen)) == NULL)
+		return (-1);
+
+	if (imsg->hdr.flags & IMSGF_HASFD)
+		imsg->fd = imsg_get_fd(ibuf);
+	else
+		imsg->fd = -1;
+
+	memcpy(imsg->data, ibuf->r.rptr, datalen);
+
+	if (imsg->hdr.len < av) {
+		left = av - imsg->hdr.len;
+		memmove(&ibuf->r.buf, ibuf->r.buf + imsg->hdr.len, left);
+		ibuf->r.wpos = left;
+	} else
+		ibuf->r.wpos = 0;
+
+	return (datalen + IMSG_HEADER_SIZE);
+}
+
+int
+imsg_compose(struct imsgbuf *ibuf, uint32_t type, uint32_t peerid, pid_t pid,
+    int fd, const void *data, uint16_t datalen)
+{
+	struct ibuf	*wbuf;
+
+	if ((wbuf = imsg_create(ibuf, type, peerid, pid, datalen)) == NULL)
+		return (-1);
+
+	if (imsg_add(wbuf, data, datalen) == -1)
+		return (-1);
+
+	wbuf->fd = fd;
+
+	imsg_close(ibuf, wbuf);
+
+	return (1);
+}
+
+int
+imsg_composev(struct imsgbuf *ibuf, uint32_t type, uint32_t peerid, pid_t pid,
+    int fd, const struct iovec *iov, int iovcnt)
+{
+	struct ibuf	*wbuf;
+	int		 i, datalen = 0;
+
+	for (i = 0; i < iovcnt; i++)
+		datalen += iov[i].iov_len;
+
+	if ((wbuf = imsg_create(ibuf, type, peerid, pid, datalen)) == NULL)
+		return (-1);
+
+	for (i = 0; i < iovcnt; i++)
+		if (imsg_add(wbuf, iov[i].iov_base, iov[i].iov_len) == -1)
+			return (-1);
+
+	wbuf->fd = fd;
+
+	imsg_close(ibuf, wbuf);
+
+	return (1);
+}
+
+/* ARGSUSED */
+struct ibuf *
+imsg_create(struct imsgbuf *ibuf, uint32_t type, uint32_t peerid, pid_t pid,
+    uint16_t datalen)
+{
+	struct ibuf	*wbuf;
+	struct imsg_hdr	 hdr;
+
+	datalen += IMSG_HEADER_SIZE;
+	if (datalen > MAX_IMSGSIZE) {
+		errno = ERANGE;
+		return (NULL);
+	}
+
+	hdr.type = type;
+	hdr.flags = 0;
+	hdr.peerid = peerid;
+	if ((hdr.pid = pid) == 0)
+		hdr.pid = ibuf->pid;
+	if ((wbuf = ibuf_dynamic(datalen, MAX_IMSGSIZE)) == NULL) {
+		return (NULL);
+	}
+	if (imsg_add(wbuf, &hdr, sizeof(hdr)) == -1)
+		return (NULL);
+
+	return (wbuf);
+}
+
+int
+imsg_add(struct ibuf *msg, const void *data, uint16_t datalen)
+{
+	if (datalen)
+		if (ibuf_add(msg, data, datalen) == -1) {
+			ibuf_free(msg);
+			return (-1);
+		}
+	return (datalen);
+}
+
+void
+imsg_close(struct imsgbuf *ibuf, struct ibuf *msg)
+{
+	struct imsg_hdr	*hdr;
+
+	hdr = (struct imsg_hdr *)msg->buf;
+
+	hdr->flags &= ~IMSGF_HASFD;
+	if (msg->fd != -1)
+		hdr->flags |= IMSGF_HASFD;
+
+	hdr->len = (uint16_t)msg->wpos;
+
+	ibuf_close(&ibuf->w, msg);
+}
+
+void
+imsg_free(struct imsg *imsg)
+{
+	freezero(imsg->data, imsg->hdr.len - IMSG_HEADER_SIZE);
+}
+
+static int
+imsg_get_fd(struct imsgbuf *ibuf)
+{
+	int		 fd;
+	struct imsg_fd	*ifd;
+
+	if ((ifd = TAILQ_FIRST(&ibuf->fds)) == NULL)
+		return (-1);
+
+	fd = ifd->fd;
+	TAILQ_REMOVE(&ibuf->fds, ifd, entry);
+	free(ifd);
+
+	return (fd);
+}
+
+int
+imsg_flush(struct imsgbuf *ibuf)
+{
+	while (ibuf->w.queued)
+		if (msgbuf_write(&ibuf->w) <= 0)
+			return (-1);
+	return (0);
+}
+
+void
+imsg_clear(struct imsgbuf *ibuf)
+{
+	int	fd;
+
+	msgbuf_clear(&ibuf->w);
+	while ((fd = imsg_get_fd(ibuf)) != -1)
+		close(fd);
+}
--- a/devel/got/files/openbsd-compat/imsg.h
+++ b/devel/got/files/openbsd-compat/imsg.h
@ -0,0 +1,113 @@
+/*	$OpenBSD: imsg.h,v 1.5 2019/01/20 02:50:03 bcook Exp $	*/
+
+/*
+ * Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
+ * Copyright (c) 2006, 2007, 2008 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _IMSG_H_
+#define _IMSG_H_
+
+#include <stdint.h>
+
+#define IBUF_READ_SIZE		65535
+#define IMSG_HEADER_SIZE	sizeof(struct imsg_hdr)
+#define MAX_IMSGSIZE		16384
+
+struct ibuf {
+	TAILQ_ENTRY(ibuf)	 entry;
+	unsigned char		*buf;
+	size_t			 size;
+	size_t			 max;
+	size_t			 wpos;
+	size_t			 rpos;
+	int			 fd;
+};
+
+struct msgbuf {
+	TAILQ_HEAD(, ibuf)	 bufs;
+	uint32_t		 queued;
+	int			 fd;
+};
+
+struct ibuf_read {
+	unsigned char		 buf[IBUF_READ_SIZE];
+	unsigned char		*rptr;
+	size_t			 wpos;
+};
+
+struct imsg_fd {
+	TAILQ_ENTRY(imsg_fd)	entry;
+	int			fd;
+};
+
+struct imsgbuf {
+	TAILQ_HEAD(, imsg_fd)	 fds;
+	struct ibuf_read	 r;
+	struct msgbuf		 w;
+	int			 fd;
+	pid_t			 pid;
+};
+
+#define IMSGF_HASFD	1
+
+struct imsg_hdr {
+	uint32_t	 type;
+	uint16_t	 len;
+	uint16_t	 flags;
+	uint32_t	 peerid;
+	uint32_t	 pid;
+};
+
+struct imsg {
+	struct imsg_hdr	 hdr;
+	int		 fd;
+	void		*data;
+};
+
+
+/* buffer.c */
+struct ibuf	*ibuf_open(size_t);
+struct ibuf	*ibuf_dynamic(size_t, size_t);
+int		 ibuf_add(struct ibuf *, const void *, size_t);
+void		*ibuf_reserve(struct ibuf *, size_t);
+void		*ibuf_seek(struct ibuf *, size_t, size_t);
+size_t		 ibuf_size(struct ibuf *);
+size_t		 ibuf_left(struct ibuf *);
+void		 ibuf_close(struct msgbuf *, struct ibuf *);
+int		 ibuf_write(struct msgbuf *);
+void		 ibuf_free(struct ibuf *);
+void		 msgbuf_init(struct msgbuf *);
+void		 msgbuf_clear(struct msgbuf *);
+int		 msgbuf_write(struct msgbuf *);
+void		 msgbuf_drain(struct msgbuf *, size_t);
+
+/* imsg.c */
+void	 imsg_init(struct imsgbuf *, int);
+ssize_t	 imsg_read(struct imsgbuf *);
+ssize_t	 imsg_get(struct imsgbuf *, struct imsg *);
+int	 imsg_compose(struct imsgbuf *, uint32_t, uint32_t, pid_t, int,
+	    const void *, uint16_t);
+int	 imsg_composev(struct imsgbuf *, uint32_t, uint32_t,  pid_t, int,
+	    const struct iovec *, int);
+struct ibuf *imsg_create(struct imsgbuf *, uint32_t, uint32_t, pid_t, uint16_t);
+int	 imsg_add(struct ibuf *, const void *, uint16_t);
+void	 imsg_close(struct imsgbuf *, struct ibuf *);
+void	 imsg_free(struct imsg *);
+int	 imsg_flush(struct imsgbuf *);
+void	 imsg_clear(struct imsgbuf *);
+
+#endif
--- a/devel/got/files/openbsd-compat/recallocarray.c
+++ b/devel/got/files/openbsd-compat/recallocarray.c
@ -0,0 +1,80 @@
+/*	$OpenBSD: recallocarray.c,v 1.1 2017/03/06 18:44:21 otto Exp $	*/
+/*
+ * Copyright (c) 2008, 2017 Otto Moerbeek <otto@drijf.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+
+/*
+ * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
+ * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
+ */
+#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4))
+
+void *
+recallocarray(void *ptr, size_t oldnmemb, size_t newnmemb, size_t size)
+{
+	size_t oldsize, newsize;
+	void *newptr;
+
+	if (ptr == NULL)
+		return calloc(newnmemb, size);
+
+	if ((newnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
+	    newnmemb > 0 && SIZE_MAX / newnmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	newsize = newnmemb * size;
+
+	if ((oldnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
+	    oldnmemb > 0 && SIZE_MAX / oldnmemb < size) {
+		errno = EINVAL;
+		return NULL;
+	}
+	oldsize = oldnmemb * size;
+	
+	/*
+	 * Don't bother too much if we're shrinking just a bit,
+	 * we do not shrink for series of small steps, oh well.
+	 */
+	if (newsize <= oldsize) {
+		size_t d = oldsize - newsize;
+
+		if (d < oldsize / 2 && d < getpagesize()) {
+			memset((char *)ptr + newsize, 0, d);
+			return ptr;
+		}
+	}
+
+	newptr = malloc(newsize);
+	if (newptr == NULL)
+		return NULL;
+
+	if (newsize > oldsize) {
+		memcpy(newptr, ptr, oldsize);
+		memset((char *)newptr + oldsize, 0, newsize - oldsize);
+	} else
+		memcpy(newptr, ptr, newsize);
+
+	explicit_bzero(ptr, oldsize);
+	free(ptr);
+
+	return newptr;
+}
--- a/devel/got/files/openbsd-compat/sha1.h
+++ b/devel/got/files/openbsd-compat/sha1.h
@ -0,0 +1,14 @@
+#ifndef _OPENBSD_COMPAT_SHA1_H_
+#define _OPENBSD_COMPAT_SHA1_H_
+
+#include <sha.h>
+
+#define SHA1_DIGEST_LENGTH		SHA_DIGEST_LENGTH
+#define SHA1_DIGEST_STRING_LENGTH	(SHA1_DIGEST_LENGTH * 2 + 1)
+
+#define SHA1_CTX	SHA_CTX
+#define SHA1Init	SHA1_Init
+#define SHA1Update	SHA1_Update
+#define SHA1Final	SHA1_Final
+
+#endif
--- a/devel/got/files/openbsd-compat/stdlib.h
+++ b/devel/got/files/openbsd-compat/stdlib.h
@ -0,0 +1,9 @@
+#ifndef _OPENBSD_COMPAT_STDLIB_H_
+#define _OPENBSD_COMPAT_STDLIB_H_
+
+#include_next <stdlib.h>
+
+void	freezero(void *, size_t);
+void	*recallocarray(void *, size_t, size_t, size_t);
+
+#endif
--- a/devel/got/files/openbsd-compat/sys/cdefs.h
+++ b/devel/got/files/openbsd-compat/sys/cdefs.h
@ -0,0 +1,8 @@
+#ifndef _OPENBSD_COMPAT_SYS_CDEFS_
+#define _OPENBSD_COMPAT_SYS_CDEFS_
+
+#include_next <sys/cdefs.h>
+
+#define __dead __dead2
+
+#endif
--- a/devel/got/files/openbsd-compat/sys/queue.h
+++ b/devel/got/files/openbsd-compat/sys/queue.h
@ -0,0 +1,119 @@
+/*	$OpenBSD: queue.h,v 1.45 2018/07/12 14:22:54 sashan Exp $	*/
+
+/*
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)queue.h	8.5 (Berkeley) 8/20/94
+ */
+
+#ifndef _OPENBSD_COMPAT_SYS_QUEUE_H_
+#define _OPENBSD_COMPAT_SYS_QUEUE_H_
+
+#include_next <sys/queue.h>
+
+/*
+ * Simple queue definitions.
+ */
+#define SIMPLEQ_HEAD(name, type)					\
+struct name {								\
+	struct type *sqh_first;	/* first element */			\
+	struct type **sqh_last;	/* addr of last next element */		\
+}
+
+#define SIMPLEQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).sqh_first }
+
+#define SIMPLEQ_ENTRY(type)						\
+struct {								\
+	struct type *sqe_next;	/* next element */			\
+}
+
+/*
+ * Simple queue access methods.
+ */
+#define	SIMPLEQ_FIRST(head)	    ((head)->sqh_first)
+#define	SIMPLEQ_END(head)	    NULL
+#define	SIMPLEQ_EMPTY(head)	    (SIMPLEQ_FIRST(head) == SIMPLEQ_END(head))
+#define	SIMPLEQ_NEXT(elm, field)    ((elm)->field.sqe_next)
+
+#define SIMPLEQ_FOREACH(var, head, field)				\
+	for((var) = SIMPLEQ_FIRST(head);				\
+	    (var) != SIMPLEQ_END(head);					\
+	    (var) = SIMPLEQ_NEXT(var, field))
+
+#define	SIMPLEQ_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = SIMPLEQ_FIRST(head);				\
+	    (var) && ((tvar) = SIMPLEQ_NEXT(var, field), 1);		\
+	    (var) = (tvar))
+
+/*
+ * Simple queue functions.
+ */
+#define	SIMPLEQ_INIT(head) do {						\
+	(head)->sqh_first = NULL;					\
+	(head)->sqh_last = &(head)->sqh_first;				\
+} while (0)
+
+#define SIMPLEQ_INSERT_HEAD(head, elm, field) do {			\
+	if (((elm)->field.sqe_next = (head)->sqh_first) == NULL)	\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+	(head)->sqh_first = (elm);					\
+} while (0)
+
+#define SIMPLEQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.sqe_next = NULL;					\
+	*(head)->sqh_last = (elm);					\
+	(head)->sqh_last = &(elm)->field.sqe_next;			\
+} while (0)
+
+#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+	(listelm)->field.sqe_next = (elm);				\
+} while (0)
+
+#define SIMPLEQ_REMOVE_HEAD(head, field) do {			\
+	if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
+		(head)->sqh_last = &(head)->sqh_first;			\
+} while (0)
+
+#define SIMPLEQ_REMOVE_AFTER(head, elm, field) do {			\
+	if (((elm)->field.sqe_next = (elm)->field.sqe_next->field.sqe_next) \
+	    == NULL)							\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+} while (0)
+
+#define SIMPLEQ_CONCAT(head1, head2) do {				\
+	if (!SIMPLEQ_EMPTY((head2))) {					\
+		*(head1)->sqh_last = (head2)->sqh_first;		\
+		(head1)->sqh_last = (head2)->sqh_last;			\
+		SIMPLEQ_INIT((head2));					\
+	}								\
+} while (0)
+
+#endif
--- a/devel/got/files/openbsd-compat/unistd.h
+++ b/devel/got/files/openbsd-compat/unistd.h
@ -0,0 +1,14 @@
+#ifndef _OPENBSD_COMPAT_UNISTD_H_
+#define _OPENBSD_COMPAT_UNISTD_H_
+
+#include_next <unistd.h>
+
+int	getdtablecount(void);
+
+/* void -> int */
+#define closefrom(fd)			(closefrom(fd), 0)
+
+#define pledge(promises, execpromises)	0
+#define unveil(path, permissions)	0
+
+#endif
--- a/devel/got/files/openbsd-compat/util.h
+++ b/devel/got/files/openbsd-compat/util.h
@ -0,0 +1,19 @@
+#ifndef _OPENBSD_COMPAT_UTIL_H_
+#define _OPENBSD_COMPAT_UTIL_H_
+
+#include <libutil.h>
+
+/*
+ * fmt_scaled(3) specific flags.
+ */
+#define FMT_SCALED_STRSIZE	7	/* minus sign, 4 digits, suffix, null byte */
+
+#define fmt_scaled(number, result) ({					\
+	int64_t num = number;						\
+	int r = humanize_number(result,					\
+	    FMT_SCALED_STRSIZE - (num < 0 ? 0 : 1),			\
+	    num, "", HN_AUTOSCALE, HN_NOSPACE | HN_B);			\
+	r == -1 ? -1 : 0;						\
+})
+
+#endif
--- a/devel/got/files/patch-Makefile
+++ b/devel/got/files/patch-Makefile
@ -0,0 +1,8 @@
+--- Makefile.orig	2020-09-09 15:30:46 UTC
+++ Makefile
+@@ -1,4 +1,4 @@
+-SUBDIR = libexec got tog
+SUBDIR = openbsd-compat libexec got tog
+ 
+ .PHONY: release dist
+ 
--- a/devel/got/files/patch-Makefile.inc
+++ b/devel/got/files/patch-Makefile.inc
@ -0,0 +1,16 @@
+--- Makefile.inc.orig	2020-07-25 09:10:27 UTC
+++ Makefile.inc
+@@ -3,6 +3,13 @@ CPPFLAGS += -DGOT_LIBEXECDIR=${LIBEXECDIR} -DGOT_VERSI
+ #CFLAGS += -DGOT_NO_OBJ_CACHE
+ #CFLAGS += -DGOT_OBJ_CACHE_DEBUG
+ 
+OPENBSD_COMPAT := ${.PARSEDIR}/openbsd-compat
+CFLAGS += ${CPPFLAGS} -I${OPENBSD_COMPAT}
+CFLAGS += -Wno-pointer-sign
+
+LDFLAGS += -L${OPENBSD_COMPAT}
+LDADD += -lopenbsd-compat -lmd
+
+ .if "${GOT_RELEASE}" == "Yes"
+ PREFIX ?= /usr/local
+ BINDIR ?= ${PREFIX}/bin
--- a/devel/got/files/patch-got_Makefile
+++ b/devel/got/files/patch-got_Makefile
@ -0,0 +1,13 @@
+--- got/Makefile.orig	2020-09-14 14:04:47 UTC
+++ got/Makefile
+@@ -25,10 +25,6 @@ DPADD = ${LIBZ} ${LIBUTIL}
+ NOMAN = Yes
+ .endif
+ 
+-realinstall:
+-	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
+-	-m ${BINMODE} ${PROG} ${BINDIR}/${PROG}
+-
+ dist:
+ 	mkdir ../got-${GOT_VERSION}/got
+ 	cp ${SRCS} ${MAN} ../got-${GOT_VERSION}/got
--- a/devel/got/files/patch-got_got.c
+++ b/devel/got/files/patch-got_got.c
@ -0,0 +1,53 @@
+--- got/got.c.orig	2020-09-14 13:58:27 UTC
+++ got/got.c
+@@ -213,7 +213,8 @@ main(int argc, char *argv[])
+ 
+ 	argc -= optind;
+ 	argv += optind;
+-	optind = 0;
+	optind = 1;
+	optreset = 1;
+ 
+ 	if (Vflag) {
+ 		got_version_print_str();
+@@ -3884,7 +3885,7 @@ print_diff(void *arg, unsigned char status, unsigned c
+ 		if (dirfd != -1) {
+ 			fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
+ 			if (fd == -1) {
+-				if (errno != ELOOP) {
+				if (errno != ELOOP && errno != EMLINK) {
+ 					err = got_error_from_errno2("openat",
+ 					    abspath);
+ 					goto done;
+@@ -3897,7 +3898,7 @@ print_diff(void *arg, unsigned char status, unsigned c
+ 		} else {
+ 			fd = open(abspath, O_RDONLY | O_NOFOLLOW);
+ 			if (fd == -1) {
+-				if (errno != ELOOP) {
+				if (errno != ELOOP && errno != EMLINK) {
+ 					err = got_error_from_errno2("open",
+ 					    abspath);
+ 					goto done;
+@@ -9283,11 +9284,11 @@ cat_commit(struct got_object_id *id, struct got_reposi
+ 	}
+ 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
+ 	    got_object_commit_get_author(commit),
+-	    got_object_commit_get_author_time(commit));
+	    (long long)got_object_commit_get_author_time(commit));
+ 
+ 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
+ 	    got_object_commit_get_author(commit),
+-	    got_object_commit_get_committer_time(commit));
+	    (long long)got_object_commit_get_committer_time(commit));
+ 
+ 	logmsg = got_object_commit_get_logmsg_raw(commit);
+ 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
+@@ -9342,7 +9343,7 @@ cat_tag(struct got_object_id *id, struct got_repositor
+ 
+ 	fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
+ 	    got_object_tag_get_tagger(tag),
+-	    got_object_tag_get_tagger_time(tag));
+	    (long long)got_object_tag_get_tagger_time(tag));
+ 
+ 	tagmsg = got_object_tag_get_message(tag);
+ 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
--- a/devel/got/files/patch-lib_object__create.c
+++ b/devel/got/files/patch-lib_object__create.c
@ -0,0 +1,44 @@
+--- lib/object_create.c.orig	2020-07-25 09:10:27 UTC
+++ lib/object_create.c
+@@ -129,7 +129,7 @@ got_object_blob_create(struct got_object_id **id, cons
+ 
+ 	fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
+ 	if (fd == -1) {
+-		if (errno != ELOOP)
+		if (errno != ELOOP && errno != EMLINK)
+ 			return got_error_from_errno2("open", ondisk_path);
+ 
+ 		if (lstat(ondisk_path, &sb) == -1) {
+@@ -142,7 +142,7 @@ got_object_blob_create(struct got_object_id **id, cons
+ 	}
+ 
+ 	if (asprintf(&header, "%s %lld", GOT_OBJ_LABEL_BLOB,
+-		sb.st_size) == -1) {
+		(long long)sb.st_size) == -1) {
+ 		err = got_error_from_errno("asprintf");
+ 		goto done;
+ 	}
+@@ -417,12 +417,12 @@ got_object_commit_create(struct got_object_id **id,
+ 	}
+ 
+ 	if (asprintf(&author_str, "%s%s %lld +0000\n",
+-	    GOT_COMMIT_LABEL_AUTHOR, author, author_time) == -1)
+	    GOT_COMMIT_LABEL_AUTHOR, author, (long long)author_time) == -1)
+ 		return got_error_from_errno("asprintf");
+ 
+ 	if (asprintf(&committer_str, "%s%s %lld +0000\n",
+ 	    GOT_COMMIT_LABEL_COMMITTER, committer ? committer : author,
+-	    committer ? committer_time : author_time)
+	    (long long)(committer ? committer_time : author_time))
+ 	    == -1) {
+ 		err = got_error_from_errno("asprintf");
+ 		goto done;
+@@ -623,7 +623,7 @@ got_object_tag_create(struct got_object_id **id,
+ 	}
+ 
+ 	if (asprintf(&tagger_str, "%s%s %lld +0000\n",
+-	    GOT_TAG_LABEL_TAGGER, tagger, tagger_time) == -1)
+	    GOT_TAG_LABEL_TAGGER, tagger, (long long)tagger_time) == -1)
+ 		return got_error_from_errno("asprintf");
+ 
+ 	msg0 = strdup(tagmsg);
--- a/devel/got/files/patch-lib_utf8.c
+++ b/devel/got/files/patch-lib_utf8.c
@ -0,0 +1,11 @@
+--- lib/utf8.c.orig	2020-09-10 16:01:39 UTC
+++ lib/utf8.c
+@@ -15,6 +15,8 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+#include <sys/types.h>
+
+ #include <err.h>
+ #include <stdlib.h>
+ #include <string.h>
--- a/devel/got/files/patch-lib_worktree.c
+++ b/devel/got/files/patch-lib_worktree.c
@ -0,0 +1,50 @@
+--- lib/worktree.c.orig	2020-09-11 17:05:16 UTC
+++ lib/worktree.c
+@@ -1225,7 +1225,7 @@ replace_existing_symlink(const char *ondisk_path, cons
+ 	 */
+ 	fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW);
+ 	if (fd == -1) {
+-		if (errno != ELOOP)
+		if (errno != ELOOP && errno != EMLINK)
+ 			return got_error_from_errno2("open", ondisk_path);
+ 
+ 		/* We are updating an existing on-disk symlink. */
+@@ -1701,9 +1701,9 @@ get_file_status(unsigned char *status, struct stat *sb
+ 		}
+ 	} else {
+ 		fd = open(abspath, O_RDONLY | O_NOFOLLOW);
+-		if (fd == -1 && errno != ENOENT && errno != ELOOP)
+		if (fd == -1 && errno != ENOENT && errno != ELOOP && errno != EMLINK)
+ 			return got_error_from_errno2("open", abspath);
+-		else if (fd == -1 && errno == ELOOP) {
+		else if (fd == -1 && (errno == ELOOP || errno == EMLINK)) {
+ 			if (lstat(abspath, sb) == -1)
+ 				return got_error_from_errno2("lstat", abspath);
+ 		} else if (fd == -1 || fstat(fd, sb) == -1) {
+@@ -3484,7 +3484,7 @@ worktree_status(struct got_worktree *worktree, const c
+ 	fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
+ 	if (fd == -1) {
+ 		if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
+-		    errno != ELOOP)
+		    errno != ELOOP && errno != EMLINK)
+ 			err = got_error_from_errno2("open", ondisk_path);
+ 		else
+ 			err = report_single_file_status(path, ondisk_path,
+@@ -4156,7 +4156,7 @@ create_patched_content(char **path_outfile, int revers
+ 	if (dirfd2 != -1) {
+ 		fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
+ 		if (fd2 == -1) {
+-			if (errno != ELOOP) {
+			if (errno != ELOOP && errno != EMLINK) {
+ 				err = got_error_from_errno2("openat", path2);
+ 				goto done;
+ 			}
+@@ -4170,7 +4170,7 @@ create_patched_content(char **path_outfile, int revers
+ 	} else {
+ 		fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
+ 		if (fd2 == -1) {
+-			if (errno != ELOOP) {
+			if (errno != ELOOP && errno != EMLINK) {
+ 				err = got_error_from_errno2("open", path2);
+ 				goto done;
+ 			}
--- a/devel/got/files/patch-libexec_Makefile.inc
+++ b/devel/got/files/patch-libexec_Makefile.inc
@ -0,0 +1,12 @@
+--- libexec/Makefile.inc.orig	2020-09-10 19:02:02 UTC
+++ libexec/Makefile.inc
+@@ -1,7 +1,5 @@
+ .include "../Makefile.inc"
+ 
+-realinstall:
+-	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
+-	-m ${BINMODE} ${PROG} ${LIBEXECDIR}/${PROG}
+BINDIR = ${PREFIX}/libexec
+ 
+-NOMAN = Yes
+MAN =
--- a/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c
+++ b/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c
@ -0,0 +1,11 @@
+--- libexec/got-index-pack/got-index-pack.c.orig	2020-09-11 20:18:20 UTC
+++ libexec/got-index-pack/got-index-pack.c
+@@ -244,7 +244,7 @@ read_packed_object(struct got_pack *pack, struct got_i
+ 			free(data);
+ 			break;
+ 		}
+-		if (asprintf(&header, "%s %lld", obj_label, obj->size) == -1) {
+		if (asprintf(&header, "%s %lld", obj_label, (long long)obj->size) == -1) {
+ 			err = got_error_from_errno("asprintf");
+ 			free(data);
+ 			break;
--- a/devel/got/files/patch-libexec_got-read-gotconfig_got-read-gotconfig.c
+++ b/devel/got/files/patch-libexec_got-read-gotconfig_got-read-gotconfig.c
@ -0,0 +1,11 @@
+XXX remove after 0.39
+--- libexec/got-read-gotconfig/got-read-gotconfig.c.orig	2020-09-14 16:29:32 UTC
+++ libexec/got-read-gotconfig/got-read-gotconfig.c
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sha1.h>
+#include <unistd.h>
+ #include <zlib.h>
+ 
+ #include "got_error.h"
--- a/devel/got/files/patch-libexec_got-read-gotconfig_parse.y
+++ b/devel/got/files/patch-libexec_got-read-gotconfig_parse.y
@ -0,0 +1,59 @@
+XXX remove first hunk after 0.39
+--- libexec/got-read-gotconfig/parse.y.orig	2020-09-14 16:35:22 UTC
+++ libexec/got-read-gotconfig/parse.y
+@@ -24,27 +24,17 @@
+ %{
+ #include <sys/types.h>
+ #include <sys/queue.h>
+-#include <sys/socket.h>
+-#include <sys/stat.h>
+ 
+-#include <netinet/in.h>
+-
+-#include <arpa/inet.h>
+-
+ #include <netdb.h>
+ 
+ #include <ctype.h>
+ #include <err.h>
+ #include <errno.h>
+-#include <event.h>
+-#include <ifaddrs.h>
+-#include <imsg.h>
+ #include <limits.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+#include <stdlib.h>
+ #include <string.h>
+-#include <syslog.h>
+-#include <unistd.h>
+ 
+ #include "got_error.h"
+ #include "gotconfig.h"
+@@ -71,7 +61,7 @@ int		 igetc(void);
+ int		 lgetc(int);
+ void		 lungetc(int);
+ int		 findeol(void);
+-static int	 parseport(char *, long long *);
+static int	 parseport(char *, int64_t *);
+ 
+ TAILQ_HEAD(symhead, sym)	 symhead = TAILQ_HEAD_INITIALIZER(symhead);
+ struct sym {
+@@ -133,7 +123,7 @@ boolean		: STRING {
+ 		;
+ numberstring	: NUMBER				{
+ 			char	*s;
+-			if (asprintf(&s, "%lld", $1) == -1) {
+			if (asprintf(&s, "%lld", (long long)$1) == -1) {
+ 				yyerror("string: asprintf");
+ 				YYERROR;
+ 			}
+@@ -395,7 +385,7 @@ getservice(char *n)
+ }
+ 
+ static int
+-parseport(char *port, long long *pn)
+parseport(char *port, int64_t *pn)
+ {
+ 	if ((*pn = getservice(port)) == -1) {
+ 		*pn = 0LL;
--- a/devel/got/files/patch-regress_Makefile
+++ b/devel/got/files/patch-regress_Makefile
@ -0,0 +1,8 @@
+--- regress/Makefile.orig	2020-09-13 22:58:33 UTC
+++ regress/Makefile
+@@ -1,3 +1,5 @@
+ SUBDIR = cmdline delta idset path fetch
+ 
+SUBDIR_TARGETS+= regress
+
+ .include <bsd.subdir.mk>
--- a/devel/got/files/patch-regress_cmdline_Makefile
+++ b/devel/got/files/patch-regress_cmdline_Makefile
@ -0,0 +1,10 @@
+--- regress/cmdline/Makefile.orig	2020-08-09 09:17:05 UTC
+++ regress/cmdline/Makefile
+@@ -78,4 +78,6 @@ fetch:
+ tree:
+ 	./tree.sh -q
+ 
+-.include <bsd.regress.mk>
+regress: ${REGRESS_TARGETS} .PHONY .SILENT
+
+.include <bsd.prog.mk>
--- a/devel/got/files/patch-regress_cmdline_commit.sh
+++ b/devel/got/files/patch-regress_cmdline_commit.sh
@ -0,0 +1,13 @@
+XXX remove after 0.39
+--- regress/cmdline/commit.sh.orig	2020-09-13 18:20:00 UTC
+++ regress/cmdline/commit.sh
+@@ -248,7 +248,8 @@ test_commit_deleted_subdirs() {
+ 		return 1
+ 	fi
+ 
+-	(cd $testroot/wt && got rm -R $testroot/wt/{epsilon,gamma} >/dev/null)
+	(cd $testroot/wt && \
+		got rm -R $testroot/wt/epsilon $testroot/wt/gamma >/dev/null)
+ 
+ 	(cd $testroot/wt && got commit -m 'test commit_deleted_subdirs' \
+ 		> $testroot/stdout 2> $testroot/stderr)
--- a/devel/got/files/patch-regress_cmdline_common.sh
+++ b/devel/got/files/patch-regress_cmdline_common.sh
@ -0,0 +1,52 @@
+XXX remove second hunk after 0.39
+--- regress/cmdline/common.sh.orig	2020-09-13 18:20:00 UTC
+++ regress/cmdline/common.sh
+@@ -24,6 +24,20 @@ export GOT_LOG_DEFAULT_LIMIT=0
+ 
+ export MALLOC_OPTIONS=S
+ 
+# compat wrapper
+sed()
+(
+	for i; do
+		arg=$1
+		shift
+		case $arg in
+		-i)	set - "$@" "$arg" '' ;;
+		*)	set - "$@" "$arg" ;;
+		esac
+	done
+	exec sed "$@"
+)
+
+ git_init()
+ {
+ 	git init -q "$1"
+@@ -96,13 +110,13 @@ git_show_tree()
+ 
+ trim_obj_id()
+ {
+-	let trimcount=$1
+-	id=$2
+	local trimcount=$1
+	local id=$2
+ 
+-	pat=""
+-	while [ trimcount -gt 0 ]; do
+	local pat=""
+	while [ "$trimcount" -gt 0 ]; do
+ 		pat="[0-9a-f]$pat"
+-		let trimcount--
+		trimcount=$((trimcount - 1))
+ 	done
+ 
+ 	echo ${id%$pat}
+@@ -168,7 +182,7 @@ test_init()
+ 		echo "No test name provided" >&2
+ 		return 1
+ 	fi
+-	local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX`
+	local testroot=`mktemp -d ${TMPDIR-/tmp}/got-test-$testname-XXXXXXXX`
+ 	mkdir $testroot/repo
+ 	git_init $testroot/repo
+ 	if [ -z "$no_tree" ]; then
--- a/devel/got/files/patch-regress_cmdline_import.sh
+++ b/devel/got/files/patch-regress_cmdline_import.sh
@ -0,0 +1,38 @@
+--- regress/cmdline/import.sh.orig	2020-09-13 18:20:00 UTC
+++ regress/cmdline/import.sh
+@@ -18,7 +18,7 @@
+ 
+ test_import_basic() {
+ 	local testname=import_basic
+-	local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX`
+	local testroot=`mktemp -d ${TMPDIR-/tmp}/got-test-$testname-XXXXXXXX`
+ 
+ 	got init $testroot/repo
+ 
+@@ -170,7 +170,7 @@ test_import_requires_new_branch() {
+ 
+ test_import_ignores() {
+ 	local testname=import_ignores
+-	local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX`
+	local testroot=`mktemp -d ${TMPDIR-/tmp}/got-test-$testname-XXXXXXXX`
+ 
+ 	got init $testroot/repo
+ 
+@@ -200,7 +200,7 @@ test_import_ignores() {
+ 
+ test_import_empty_dir() {
+ 	local testname=import_empty_dir
+-	local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX`
+	local testroot=`mktemp -d ${TMPDIR-/tmp}/got-test-$testname-XXXXXXXX`
+ 
+ 	got init $testroot/repo
+ 
+@@ -243,7 +243,7 @@ test_import_empty_dir() {
+ 
+ test_import_symlink() {
+ 	local testname=import_symlink
+-	local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX`
+	local testroot=`mktemp -d ${TMPDIR-/tmp}/got-test-$testname-XXXXXXXX`
+ 
+ 	got init $testroot/repo
+ 
--- a/devel/got/files/patch-regress_cmdline_rm.sh
+++ b/devel/got/files/patch-regress_cmdline_rm.sh
@ -0,0 +1,20 @@
+--- regress/cmdline/rm.sh.orig	2020-09-15 22:43:33 UTC
+++ regress/cmdline/rm.sh
+@@ -239,7 +239,7 @@ test_rm_directory() {
+ 		return 1
+ 	fi
+ 
+-	(cd $testroot/wt && ls -l > $testroot/stdout)
+	(cd $testroot/wt && ls -l | sed '/^total/d' > $testroot/stdout)
+ 
+ 	echo -n '' > $testroot/stdout.expected
+ 
+@@ -251,7 +251,7 @@ test_rm_directory() {
+ 		return 1
+ 	fi
+ 
+-	(cd $testroot/wt && ls -l > $testroot/stdout)
+	(cd $testroot/wt && ls -l | sed '/^total/d' > $testroot/stdout)
+ 
+ 	echo -n '' > $testroot/stdout.expected
+ 
--- a/devel/got/files/patch-regress_delta_Makefile
+++ b/devel/got/files/patch-regress_delta_Makefile
@ -0,0 +1,12 @@
+--- regress/delta/Makefile.orig	2020-08-09 09:17:05 UTC
+++ regress/delta/Makefile
+@@ -8,7 +8,7 @@ LDADD = -lz
+ 
+ NOMAN = yes
+ 
+-run-regress-delta_test:
+regress: ${PROG} .PHONY
+ 	${.OBJDIR}/delta_test -q
+ 
+-.include <bsd.regress.mk>
+.include <bsd.prog.mk>
--- a/devel/got/files/patch-regress_fetch_Makefile
+++ b/devel/got/files/patch-regress_fetch_Makefile
@ -0,0 +1,12 @@
+--- regress/fetch/Makefile.orig	2020-09-11 17:05:16 UTC
+++ regress/fetch/Makefile
+@@ -11,7 +11,7 @@ LDADD = -lutil -lz
+ 
+ NOMAN = yes
+ 
+-run-regress-fetch_test:
+regress: ${PROG} .PHONY
+ 	${.OBJDIR}/fetch_test -q
+ 
+-.include <bsd.regress.mk>
+.include <bsd.prog.mk>
--- a/devel/got/files/patch-regress_idset_Makefile
+++ b/devel/got/files/patch-regress_idset_Makefile
@ -0,0 +1,12 @@
+--- regress/idset/Makefile.orig	2020-08-09 09:17:05 UTC
+++ regress/idset/Makefile
+@@ -9,7 +9,7 @@ LDADD = -lutil -lz
+ 
+ NOMAN = yes
+ 
+-run-regress-idset_test:
+regress: ${PROG} .PHONY
+ 	${.OBJDIR}/idset_test -q
+ 
+-.include <bsd.regress.mk>
+.include <bsd.prog.mk>
--- a/devel/got/files/patch-regress_path_Makefile
+++ b/devel/got/files/patch-regress_path_Makefile
@ -0,0 +1,12 @@
+--- regress/path/Makefile.orig	2020-08-09 09:17:05 UTC
+++ regress/path/Makefile
+@@ -8,7 +8,7 @@ LDADD = -lutil -lz
+ 
+ NOMAN = yes
+ 
+-run-regress-path_test:
+regress: ${PROG} .PHONY
+ 	${.OBJDIR}/path_test -q
+ 
+-.include <bsd.regress.mk>
+.include <bsd.prog.mk>
--- a/devel/got/files/patch-tog_Makefile
+++ b/devel/got/files/patch-tog_Makefile
@ -0,0 +1,11 @@
+--- tog/Makefile.orig	2020-09-11 17:05:16 UTC
+++ tog/Makefile
+@@ -25,8 +25,4 @@ DPADD = ${LIBZ} ${LIBUTIL}
+ NOMAN = Yes
+ .endif
+ 
+-realinstall:
+-	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
+-	-m ${BINMODE} ${PROG} ${BINDIR}/${PROG}
+-
+ .include <bsd.prog.mk>
--- a/devel/got/files/patch-tog_tog.c
+++ b/devel/got/files/patch-tog_tog.c
@ -0,0 +1,11 @@
+--- tog/tog.c.orig	2020-09-14 19:31:57 UTC
+++ tog/tog.c
+@@ -5645,7 +5645,7 @@ main(int argc, char *argv[])
+ 
+ 	argc -= optind;
+ 	argv += optind;
+-	optind = 0;
+	optind = 1;
+ 	optreset = 1;
+ 
+ 	if (Vflag) {
--- a/devel/got/pkg-descr
+++ b/devel/got/pkg-descr
@ -0,0 +1,9 @@
+Game of Trees (Got) is a version control system which prioritizes
+ease of use and simplicity over flexibility.
+
+Got uses Git repositories to store versioned data. Git can be used
+for any functionality which has not yet been implemented in Got.
+It will always remain possible to work with both Got and Git on the
+same repository.
+
+WWW: https://gameoftrees.org
--- a/devel/got/pkg-plist
+++ b/devel/got/pkg-plist
@ -0,0 +1,17 @@
+bin/got
+bin/tog
+libexec/got-fetch-pack
+libexec/got-index-pack
+libexec/got-read-blob
+libexec/got-read-commit
+libexec/got-read-gitconfig
+libexec/got-read-gotconfig
+libexec/got-read-object
+libexec/got-read-pack
+libexec/got-read-tag
+libexec/got-read-tree
+man/man1/got.1.gz
+man/man1/tog.1.gz
+man/man5/git-repository.5.gz
+man/man5/got-worktree.5.gz
+man/man5/got.conf.5.gz
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gtranslator
-PORTVERSION=	2.91.7
-PORTREVISION=	2
+PORTVERSION=	3.36.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME

@ -17,29 +16,23 @@ BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libpeas-1.0.so:devel/libpeas \
 		libgdl-3.so:x11-toolkits/gdl \
-		libjson-glib-1.0.so:devel/json-glib
+		libjson-glib-1.0.so:devel/json-glib \
+		libdazzle-1.0.so:x11-toolkits/libdazzle \
+		libgspell-1.so:textproc/gspell
 RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas

-USE_GNOME=	intlhack gnomeprefix gtk30 libgda5 gtksourceview3 libxml2 \
+USE_GNOME=	gtk30 libgda5 gtksourceview4 libxml2 \
 		introspection:build
-USES=		desktop-file-utils gettext gmake gnome libtool pathfix \
+USES=		desktop-file-utils gettext localbase:ldflags gnome meson \
 		pkgconfig python tar:xz
 USE_PYTHON=	py3kplist
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-debug \
-		--with-gda=5.0 \
-		--without-dictionary \
-		--enable-compile-warnings=no
+MESON_ARGS=	-Dgtk_doc=false
 INSTALL_TARGET=	install-strip

-GLIB_SCHEMAS=	org.gnome.gtranslator.gschema.xml \
-		org.gnome.gtranslator.plugins.codeview.gschema.xml \
-		org.gnome.gtranslator.plugins.open-tran.gschema.xml \
+GLIB_SCHEMAS=	org.gnome.Gtranslator.gschema.xml \
 		org.gnome.gtranslator.plugins.translation-memory.gschema.xml

 .include <bsd.port.mk>
--- a/devel/gtranslator/distinfo
+++ b/devel/gtranslator/distinfo
@ -1,2 +1,3 @@
-SHA256 (gtranslator-2.91.7.tar.xz) = 2b25b45b33e4aa856953b4a5da1d98bd51a343ddb479aeae3934bfe0c3651f9d
-SIZE (gtranslator-2.91.7.tar.xz) = 2835836
+TIMESTAMP = 1600343903
+SHA256 (gtranslator-3.36.0.tar.xz) = 2daa1d3b59b4a35ef54df087345b03e1703e725081f9dac543539228a715add3
+SIZE (gtranslator-3.36.0.tar.xz) = 2121776
--- a/devel/gtranslator/pkg-plist
+++ b/devel/gtranslator/pkg-plist
@ -1,142 +1,19 @@
 bin/gtranslator
-include/gtranslator-3.0/gtranslator/gtr-application.h
-include/gtranslator-3.0/gtranslator/gtr-context.h
-include/gtranslator-3.0/gtranslator/gtr-debug.h
-include/gtranslator-3.0/gtranslator/gtr-header.h
-include/gtranslator-3.0/gtranslator/gtr-message-container.h
-include/gtranslator-3.0/gtranslator/gtr-message-table.h
-include/gtranslator-3.0/gtranslator/gtr-msg.h
-include/gtranslator-3.0/gtranslator/gtr-notebook.h
-include/gtranslator-3.0/gtranslator/gtr-po.h
-include/gtranslator-3.0/gtranslator/gtr-profile.h
-include/gtranslator-3.0/gtranslator/gtr-statusbar.h
-include/gtranslator-3.0/gtranslator/gtr-tab-activatable.h
-include/gtranslator-3.0/gtranslator/gtr-tab.h
-include/gtranslator-3.0/gtranslator/gtr-view.h
-include/gtranslator-3.0/gtranslator/gtr-window-activatable.h
-include/gtranslator-3.0/gtranslator/gtr-window.h
-lib/gtranslator/girepository-1.0/Gtranslator-3.0.typelib
-lib/gtranslator/libgtranslator-private.a
-lib/gtranslator/libgtranslator-private.so
-lib/gtranslator/plugins/charmap/__init__.py
-lib/gtranslator/plugins/charmap/__init__.pyc
-lib/gtranslator/plugins/charmap/__init__.pyo
-lib/gtranslator/plugins/charmap/panel.py
-lib/gtranslator/plugins/charmap/panel.pyc
-lib/gtranslator/plugins/charmap/panel.pyo
-lib/gtranslator/plugins/gtr-alternate-language.plugin
-lib/gtranslator/plugins/gtr-charmap.plugin
-lib/gtranslator/plugins/gtr-codeview.plugin
-lib/gtranslator/plugins/gtr-fullscreen.plugin
-lib/gtranslator/plugins/gtr-insert-params.plugin
-lib/gtranslator/plugins/gtr-open-tran.plugin
-lib/gtranslator/plugins/gtr-translation-memory.plugin
-lib/gtranslator/plugins/libalternatelang.a
-lib/gtranslator/plugins/libalternatelang.so
-lib/gtranslator/plugins/libfullscreen.a
-lib/gtranslator/plugins/libfullscreen.so
-lib/gtranslator/plugins/libinsertparams.a
-lib/gtranslator/plugins/libinsertparams.so
-lib/gtranslator/plugins/libopentran.a
-lib/gtranslator/plugins/libopentran.so
-lib/gtranslator/plugins/libsourcecodeview.a
-lib/gtranslator/plugins/libsourcecodeview.so
-lib/gtranslator/plugins/libtranslation-memory.a
-lib/gtranslator/plugins/libtranslation-memory.so
-libdata/pkgconfig/gtranslator.pc
+include/gtr-marshal.h
 man/man1/gtranslator.1.gz
-share/appdata/gtranslator.appdata.xml
-share/applications/gtranslator.desktop
-%%DOCSDIR%%/ExtendedClassDiagram.png
-%%DOCSDIR%%/SingleClassDiagram.png
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch01s02.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/gtranslator-GtrApplication.html
-%%DOCSDIR%%/gtranslator-GtrContextPanel.html
-%%DOCSDIR%%/gtranslator-GtrHeader.html
-%%DOCSDIR%%/gtranslator-GtrHistoryEntry.html
-%%DOCSDIR%%/gtranslator-GtrMessageTable.html
-%%DOCSDIR%%/gtranslator-GtrMsg.html
-%%DOCSDIR%%/gtranslator-GtrNotebook.html
-%%DOCSDIR%%/gtranslator-GtrPo.html
-%%DOCSDIR%%/gtranslator-GtrProfile.html
-%%DOCSDIR%%/gtranslator-GtrStatusbar.html
-%%DOCSDIR%%/gtranslator-GtrTab.html
-%%DOCSDIR%%/gtranslator-GtrView.html
-%%DOCSDIR%%/gtranslator-GtrWindow.html
-%%DOCSDIR%%/gtranslator-gtr-debug.html
-%%DOCSDIR%%/gtranslator-gtr-io-error-info-bar.html
-%%DOCSDIR%%/gtranslator-gtr-utils.html
-%%DOCSDIR%%/gtranslator.devhelp2
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left-insensitive.png
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right-insensitive.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up-insensitive.png
-%%DOCSDIR%%/up.png
-%%DATADIR%%/dtd/umtf.dtd
-%%DATADIR%%/gir-1.0/Gtranslator-3.0.gir
-%%DATADIR%%/pixmaps/debian.png
-%%DATADIR%%/pixmaps/fedora.png
-%%DATADIR%%/pixmaps/gnome.png
-%%DATADIR%%/pixmaps/gtranslator-fuzzy-next.png
-%%DATADIR%%/pixmaps/gtranslator-fuzzy-prev.png
-%%DATADIR%%/pixmaps/gtranslator-fuzzy-untranslated-next.png
-%%DATADIR%%/pixmaps/gtranslator-fuzzy-untranslated-prev.png
-%%DATADIR%%/pixmaps/gtranslator-logo.png
-%%DATADIR%%/pixmaps/gtranslator-plugin.png
-%%DATADIR%%/pixmaps/gtranslator-untranslated-next.png
-%%DATADIR%%/pixmaps/gtranslator-untranslated-prev.png
-%%DATADIR%%/pixmaps/inkscape.png
-%%DATADIR%%/pixmaps/kde.ico
-%%DATADIR%%/pixmaps/mandriva.png
-%%DATADIR%%/pixmaps/mozilla.png
-%%DATADIR%%/pixmaps/oo-logo.png
-%%DATADIR%%/pixmaps/open-tran.png
-%%DATADIR%%/pixmaps/suse.png
-%%DATADIR%%/pixmaps/xfce.png
+share/applications/org.gnome.Gtranslator.desktop
+%%DATADIR%%/sourceview/gtranslator.lang
+%%DATADIR%%/ui/gtr-languages.ini
 %%DATADIR%%/ui/gtr-plural-forms.ini
-%%DATADIR%%/ui/gtr-toolbar.xml
-%%DATADIR%%/ui/layout.xml
-%%DATADIR%%/ui/po.lang
-share/help/C/gtranslator/figures/Gtranslator_022.png
-share/help/C/gtranslator/figures/Gtranslator_023.png
-share/help/C/gtranslator/figures/Gtranslator_025.png
-share/help/C/gtranslator/figures/Gtranslator_026.png
-share/help/C/gtranslator/figures/Gtranslator_027.png
-share/help/C/gtranslator/figures/add-profile.png
-share/help/C/gtranslator/figures/comment-text.png
-share/help/C/gtranslator/figures/edit-profile.png
-share/help/C/gtranslator/figures/edit-text.png
-share/help/C/gtranslator/figures/edit-toolbar.png
-share/help/C/gtranslator/figures/edit_header.png
-share/help/C/gtranslator/figures/edit_header2.png
-share/help/C/gtranslator/figures/gtr-prefs-tm.png
-share/help/C/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/C/gtranslator/figures/gtranslator-plugins.png
-share/help/C/gtranslator/figures/gtranslator.png
-share/help/C/gtranslator/figures/gtranslator22.png
+share/help/C/gtranslator/figures/color-8ca7ff.png
+share/help/C/gtranslator/figures/color-8cff8e.png
+share/help/C/gtranslator/figures/color-ff8c8c.png
 share/help/C/gtranslator/figures/gtranslator32.png
-share/help/C/gtranslator/figures/gtranslator_interface.png
+share/help/C/gtranslator/figures/gtranslator_interface2.png
 share/help/C/gtranslator/figures/gtranslator_tm_strings.png
-share/help/C/gtranslator/figures/message-detail.png
-share/help/C/gtranslator/figures/mover1.png
-share/help/C/gtranslator/figures/mover2.png
-share/help/C/gtranslator/figures/mover3.png
-share/help/C/gtranslator/figures/mover4.png
-share/help/C/gtranslator/figures/mover5.png
-share/help/C/gtranslator/figures/profiles2.png
-share/help/C/gtranslator/figures/tm-manager.png
-share/help/C/gtranslator/figures/use-tm-entry.png
 share/help/C/gtranslator/gtr-add-comment-po.page
 share/help/C/gtranslator/gtr-concepts.page
 share/help/C/gtranslator/gtr-create-tm.page
-share/help/C/gtranslator/gtr-custom.page
 share/help/C/gtranslator/gtr-edit-header.page
 share/help/C/gtranslator/gtr-edit-po.page
 share/help/C/gtranslator/gtr-faq.page
@ -144,7 +21,6 @@ share/help/C/gtranslator/gtr-goto-string-po.page
 share/help/C/gtranslator/gtr-join-users.page
 share/help/C/gtranslator/gtr-main-window.page
 share/help/C/gtranslator/gtr-open-po.page
-share/help/C/gtranslator/gtr-plugins.page
 share/help/C/gtranslator/gtr-profiles.page
 share/help/C/gtranslator/gtr-quickstart.page
 share/help/C/gtranslator/gtr-report-problem.page
@ -154,40 +30,17 @@ share/help/C/gtranslator/gtr-translate.page
 share/help/C/gtranslator/gtr-use-delete-entry.page
 share/help/C/gtranslator/gtr-wizzard.page
 share/help/C/gtranslator/index.page
+share/help/C/gtranslator/legal.xml
 share/help/C/gtranslator/license.page
-share/help/cs/gtranslator/figures/Gtranslator_022.png
-share/help/cs/gtranslator/figures/Gtranslator_023.png
-share/help/cs/gtranslator/figures/Gtranslator_025.png
-share/help/cs/gtranslator/figures/Gtranslator_026.png
-share/help/cs/gtranslator/figures/Gtranslator_027.png
-share/help/cs/gtranslator/figures/add-profile.png
-share/help/cs/gtranslator/figures/comment-text.png
-share/help/cs/gtranslator/figures/edit-profile.png
-share/help/cs/gtranslator/figures/edit-text.png
-share/help/cs/gtranslator/figures/edit-toolbar.png
-share/help/cs/gtranslator/figures/edit_header.png
-share/help/cs/gtranslator/figures/edit_header2.png
-share/help/cs/gtranslator/figures/gtr-prefs-tm.png
-share/help/cs/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/cs/gtranslator/figures/gtranslator-plugins.png
-share/help/cs/gtranslator/figures/gtranslator.png
-share/help/cs/gtranslator/figures/gtranslator22.png
+share/help/cs/gtranslator/figures/color-8ca7ff.png
+share/help/cs/gtranslator/figures/color-8cff8e.png
+share/help/cs/gtranslator/figures/color-ff8c8c.png
 share/help/cs/gtranslator/figures/gtranslator32.png
-share/help/cs/gtranslator/figures/gtranslator_interface.png
+share/help/cs/gtranslator/figures/gtranslator_interface2.png
 share/help/cs/gtranslator/figures/gtranslator_tm_strings.png
-share/help/cs/gtranslator/figures/message-detail.png
-share/help/cs/gtranslator/figures/mover1.png
-share/help/cs/gtranslator/figures/mover2.png
-share/help/cs/gtranslator/figures/mover3.png
-share/help/cs/gtranslator/figures/mover4.png
-share/help/cs/gtranslator/figures/mover5.png
-share/help/cs/gtranslator/figures/profiles2.png
-share/help/cs/gtranslator/figures/tm-manager.png
-share/help/cs/gtranslator/figures/use-tm-entry.png
 share/help/cs/gtranslator/gtr-add-comment-po.page
 share/help/cs/gtranslator/gtr-concepts.page
 share/help/cs/gtranslator/gtr-create-tm.page
-share/help/cs/gtranslator/gtr-custom.page
 share/help/cs/gtranslator/gtr-edit-header.page
 share/help/cs/gtranslator/gtr-edit-po.page
 share/help/cs/gtranslator/gtr-faq.page
@ -195,7 +48,6 @@ share/help/cs/gtranslator/gtr-goto-string-po.page
 share/help/cs/gtranslator/gtr-join-users.page
 share/help/cs/gtranslator/gtr-main-window.page
 share/help/cs/gtranslator/gtr-open-po.page
-share/help/cs/gtranslator/gtr-plugins.page
 share/help/cs/gtranslator/gtr-profiles.page
 share/help/cs/gtranslator/gtr-quickstart.page
 share/help/cs/gtranslator/gtr-report-problem.page
@ -205,40 +57,17 @@ share/help/cs/gtranslator/gtr-translate.page
 share/help/cs/gtranslator/gtr-use-delete-entry.page
 share/help/cs/gtranslator/gtr-wizzard.page
 share/help/cs/gtranslator/index.page
+share/help/cs/gtranslator/legal.xml
 share/help/cs/gtranslator/license.page
-share/help/de/gtranslator/figures/Gtranslator_022.png
-share/help/de/gtranslator/figures/Gtranslator_023.png
-share/help/de/gtranslator/figures/Gtranslator_025.png
-share/help/de/gtranslator/figures/Gtranslator_026.png
-share/help/de/gtranslator/figures/Gtranslator_027.png
-share/help/de/gtranslator/figures/add-profile.png
-share/help/de/gtranslator/figures/comment-text.png
-share/help/de/gtranslator/figures/edit-profile.png
-share/help/de/gtranslator/figures/edit-text.png
-share/help/de/gtranslator/figures/edit-toolbar.png
-share/help/de/gtranslator/figures/edit_header.png
-share/help/de/gtranslator/figures/edit_header2.png
-share/help/de/gtranslator/figures/gtr-prefs-tm.png
-share/help/de/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/de/gtranslator/figures/gtranslator-plugins.png
-share/help/de/gtranslator/figures/gtranslator.png
-share/help/de/gtranslator/figures/gtranslator22.png
+share/help/de/gtranslator/figures/color-8ca7ff.png
+share/help/de/gtranslator/figures/color-8cff8e.png
+share/help/de/gtranslator/figures/color-ff8c8c.png
 share/help/de/gtranslator/figures/gtranslator32.png
-share/help/de/gtranslator/figures/gtranslator_interface.png
+share/help/de/gtranslator/figures/gtranslator_interface2.png
 share/help/de/gtranslator/figures/gtranslator_tm_strings.png
-share/help/de/gtranslator/figures/message-detail.png
-share/help/de/gtranslator/figures/mover1.png
-share/help/de/gtranslator/figures/mover2.png
-share/help/de/gtranslator/figures/mover3.png
-share/help/de/gtranslator/figures/mover4.png
-share/help/de/gtranslator/figures/mover5.png
-share/help/de/gtranslator/figures/profiles2.png
-share/help/de/gtranslator/figures/tm-manager.png
-share/help/de/gtranslator/figures/use-tm-entry.png
 share/help/de/gtranslator/gtr-add-comment-po.page
 share/help/de/gtranslator/gtr-concepts.page
 share/help/de/gtranslator/gtr-create-tm.page
-share/help/de/gtranslator/gtr-custom.page
 share/help/de/gtranslator/gtr-edit-header.page
 share/help/de/gtranslator/gtr-edit-po.page
 share/help/de/gtranslator/gtr-faq.page
@ -246,7 +75,6 @@ share/help/de/gtranslator/gtr-goto-string-po.page
 share/help/de/gtranslator/gtr-join-users.page
 share/help/de/gtranslator/gtr-main-window.page
 share/help/de/gtranslator/gtr-open-po.page
-share/help/de/gtranslator/gtr-plugins.page
 share/help/de/gtranslator/gtr-profiles.page
 share/help/de/gtranslator/gtr-quickstart.page
 share/help/de/gtranslator/gtr-report-problem.page
@ -256,40 +84,17 @@ share/help/de/gtranslator/gtr-translate.page
 share/help/de/gtranslator/gtr-use-delete-entry.page
 share/help/de/gtranslator/gtr-wizzard.page
 share/help/de/gtranslator/index.page
+share/help/de/gtranslator/legal.xml
 share/help/de/gtranslator/license.page
-share/help/el/gtranslator/figures/Gtranslator_022.png
-share/help/el/gtranslator/figures/Gtranslator_023.png
-share/help/el/gtranslator/figures/Gtranslator_025.png
-share/help/el/gtranslator/figures/Gtranslator_026.png
-share/help/el/gtranslator/figures/Gtranslator_027.png
-share/help/el/gtranslator/figures/add-profile.png
-share/help/el/gtranslator/figures/comment-text.png
-share/help/el/gtranslator/figures/edit-profile.png
-share/help/el/gtranslator/figures/edit-text.png
-share/help/el/gtranslator/figures/edit-toolbar.png
-share/help/el/gtranslator/figures/edit_header.png
-share/help/el/gtranslator/figures/edit_header2.png
-share/help/el/gtranslator/figures/gtr-prefs-tm.png
-share/help/el/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/el/gtranslator/figures/gtranslator-plugins.png
-share/help/el/gtranslator/figures/gtranslator.png
-share/help/el/gtranslator/figures/gtranslator22.png
+share/help/el/gtranslator/figures/color-8ca7ff.png
+share/help/el/gtranslator/figures/color-8cff8e.png
+share/help/el/gtranslator/figures/color-ff8c8c.png
 share/help/el/gtranslator/figures/gtranslator32.png
-share/help/el/gtranslator/figures/gtranslator_interface.png
+share/help/el/gtranslator/figures/gtranslator_interface2.png
 share/help/el/gtranslator/figures/gtranslator_tm_strings.png
-share/help/el/gtranslator/figures/message-detail.png
-share/help/el/gtranslator/figures/mover1.png
-share/help/el/gtranslator/figures/mover2.png
-share/help/el/gtranslator/figures/mover3.png
-share/help/el/gtranslator/figures/mover4.png
-share/help/el/gtranslator/figures/mover5.png
-share/help/el/gtranslator/figures/profiles2.png
-share/help/el/gtranslator/figures/tm-manager.png
-share/help/el/gtranslator/figures/use-tm-entry.png
 share/help/el/gtranslator/gtr-add-comment-po.page
 share/help/el/gtranslator/gtr-concepts.page
 share/help/el/gtranslator/gtr-create-tm.page
-share/help/el/gtranslator/gtr-custom.page
 share/help/el/gtranslator/gtr-edit-header.page
 share/help/el/gtranslator/gtr-edit-po.page
 share/help/el/gtranslator/gtr-faq.page
@ -297,7 +102,6 @@ share/help/el/gtranslator/gtr-goto-string-po.page
 share/help/el/gtranslator/gtr-join-users.page
 share/help/el/gtranslator/gtr-main-window.page
 share/help/el/gtranslator/gtr-open-po.page
-share/help/el/gtranslator/gtr-plugins.page
 share/help/el/gtranslator/gtr-profiles.page
 share/help/el/gtranslator/gtr-quickstart.page
 share/help/el/gtranslator/gtr-report-problem.page
@ -307,40 +111,17 @@ share/help/el/gtranslator/gtr-translate.page
 share/help/el/gtranslator/gtr-use-delete-entry.page
 share/help/el/gtranslator/gtr-wizzard.page
 share/help/el/gtranslator/index.page
+share/help/el/gtranslator/legal.xml
 share/help/el/gtranslator/license.page
-share/help/es/gtranslator/figures/Gtranslator_022.png
-share/help/es/gtranslator/figures/Gtranslator_023.png
-share/help/es/gtranslator/figures/Gtranslator_025.png
-share/help/es/gtranslator/figures/Gtranslator_026.png
-share/help/es/gtranslator/figures/Gtranslator_027.png
-share/help/es/gtranslator/figures/add-profile.png
-share/help/es/gtranslator/figures/comment-text.png
-share/help/es/gtranslator/figures/edit-profile.png
-share/help/es/gtranslator/figures/edit-text.png
-share/help/es/gtranslator/figures/edit-toolbar.png
-share/help/es/gtranslator/figures/edit_header.png
-share/help/es/gtranslator/figures/edit_header2.png
-share/help/es/gtranslator/figures/gtr-prefs-tm.png
-share/help/es/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/es/gtranslator/figures/gtranslator-plugins.png
-share/help/es/gtranslator/figures/gtranslator.png
-share/help/es/gtranslator/figures/gtranslator22.png
+share/help/es/gtranslator/figures/color-8ca7ff.png
+share/help/es/gtranslator/figures/color-8cff8e.png
+share/help/es/gtranslator/figures/color-ff8c8c.png
 share/help/es/gtranslator/figures/gtranslator32.png
-share/help/es/gtranslator/figures/gtranslator_interface.png
+share/help/es/gtranslator/figures/gtranslator_interface2.png
 share/help/es/gtranslator/figures/gtranslator_tm_strings.png
-share/help/es/gtranslator/figures/message-detail.png
-share/help/es/gtranslator/figures/mover1.png
-share/help/es/gtranslator/figures/mover2.png
-share/help/es/gtranslator/figures/mover3.png
-share/help/es/gtranslator/figures/mover4.png
-share/help/es/gtranslator/figures/mover5.png
-share/help/es/gtranslator/figures/profiles2.png
-share/help/es/gtranslator/figures/tm-manager.png
-share/help/es/gtranslator/figures/use-tm-entry.png
 share/help/es/gtranslator/gtr-add-comment-po.page
 share/help/es/gtranslator/gtr-concepts.page
 share/help/es/gtranslator/gtr-create-tm.page
-share/help/es/gtranslator/gtr-custom.page
 share/help/es/gtranslator/gtr-edit-header.page
 share/help/es/gtranslator/gtr-edit-po.page
 share/help/es/gtranslator/gtr-faq.page
@ -348,7 +129,6 @@ share/help/es/gtranslator/gtr-goto-string-po.page
 share/help/es/gtranslator/gtr-join-users.page
 share/help/es/gtranslator/gtr-main-window.page
 share/help/es/gtranslator/gtr-open-po.page
-share/help/es/gtranslator/gtr-plugins.page
 share/help/es/gtranslator/gtr-profiles.page
 share/help/es/gtranslator/gtr-quickstart.page
 share/help/es/gtranslator/gtr-report-problem.page
@ -358,91 +138,17 @@ share/help/es/gtranslator/gtr-translate.page
 share/help/es/gtranslator/gtr-use-delete-entry.page
 share/help/es/gtranslator/gtr-wizzard.page
 share/help/es/gtranslator/index.page
+share/help/es/gtranslator/legal.xml
 share/help/es/gtranslator/license.page
-share/help/eu/gtranslator/figures/Gtranslator_022.png
-share/help/eu/gtranslator/figures/Gtranslator_023.png
-share/help/eu/gtranslator/figures/Gtranslator_025.png
-share/help/eu/gtranslator/figures/Gtranslator_026.png
-share/help/eu/gtranslator/figures/Gtranslator_027.png
-share/help/eu/gtranslator/figures/add-profile.png
-share/help/eu/gtranslator/figures/comment-text.png
-share/help/eu/gtranslator/figures/edit-profile.png
-share/help/eu/gtranslator/figures/edit-text.png
-share/help/eu/gtranslator/figures/edit-toolbar.png
-share/help/eu/gtranslator/figures/edit_header.png
-share/help/eu/gtranslator/figures/edit_header2.png
-share/help/eu/gtranslator/figures/gtr-prefs-tm.png
-share/help/eu/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/eu/gtranslator/figures/gtranslator-plugins.png
-share/help/eu/gtranslator/figures/gtranslator.png
-share/help/eu/gtranslator/figures/gtranslator22.png
-share/help/eu/gtranslator/figures/gtranslator32.png
-share/help/eu/gtranslator/figures/gtranslator_interface.png
-share/help/eu/gtranslator/figures/gtranslator_tm_strings.png
-share/help/eu/gtranslator/figures/message-detail.png
-share/help/eu/gtranslator/figures/mover1.png
-share/help/eu/gtranslator/figures/mover2.png
-share/help/eu/gtranslator/figures/mover3.png
-share/help/eu/gtranslator/figures/mover4.png
-share/help/eu/gtranslator/figures/mover5.png
-share/help/eu/gtranslator/figures/profiles2.png
-share/help/eu/gtranslator/figures/tm-manager.png
-share/help/eu/gtranslator/figures/use-tm-entry.png
-share/help/eu/gtranslator/gtr-add-comment-po.page
-share/help/eu/gtranslator/gtr-concepts.page
-share/help/eu/gtranslator/gtr-create-tm.page
-share/help/eu/gtranslator/gtr-custom.page
-share/help/eu/gtranslator/gtr-edit-header.page
-share/help/eu/gtranslator/gtr-edit-po.page
-share/help/eu/gtranslator/gtr-faq.page
-share/help/eu/gtranslator/gtr-goto-string-po.page
-share/help/eu/gtranslator/gtr-join-users.page
-share/help/eu/gtranslator/gtr-main-window.page
-share/help/eu/gtranslator/gtr-open-po.page
-share/help/eu/gtranslator/gtr-plugins.page
-share/help/eu/gtranslator/gtr-profiles.page
-share/help/eu/gtranslator/gtr-quickstart.page
-share/help/eu/gtranslator/gtr-report-problem.page
-share/help/eu/gtranslator/gtr-save-po.page
-share/help/eu/gtranslator/gtr-shortcut-keys.page
-share/help/eu/gtranslator/gtr-translate.page
-share/help/eu/gtranslator/gtr-use-delete-entry.page
-share/help/eu/gtranslator/gtr-wizzard.page
-share/help/eu/gtranslator/index.page
-share/help/eu/gtranslator/license.page
-share/help/fr/gtranslator/figures/Gtranslator_022.png
-share/help/fr/gtranslator/figures/Gtranslator_023.png
-share/help/fr/gtranslator/figures/Gtranslator_025.png
-share/help/fr/gtranslator/figures/Gtranslator_026.png
-share/help/fr/gtranslator/figures/Gtranslator_027.png
-share/help/fr/gtranslator/figures/add-profile.png
-share/help/fr/gtranslator/figures/comment-text.png
-share/help/fr/gtranslator/figures/edit-profile.png
-share/help/fr/gtranslator/figures/edit-text.png
-share/help/fr/gtranslator/figures/edit-toolbar.png
-share/help/fr/gtranslator/figures/edit_header.png
-share/help/fr/gtranslator/figures/edit_header2.png
-share/help/fr/gtranslator/figures/gtr-prefs-tm.png
-share/help/fr/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/fr/gtranslator/figures/gtranslator-plugins.png
-share/help/fr/gtranslator/figures/gtranslator.png
-share/help/fr/gtranslator/figures/gtranslator22.png
+share/help/fr/gtranslator/figures/color-8ca7ff.png
+share/help/fr/gtranslator/figures/color-8cff8e.png
+share/help/fr/gtranslator/figures/color-ff8c8c.png
 share/help/fr/gtranslator/figures/gtranslator32.png
-share/help/fr/gtranslator/figures/gtranslator_interface.png
+share/help/fr/gtranslator/figures/gtranslator_interface2.png
 share/help/fr/gtranslator/figures/gtranslator_tm_strings.png
-share/help/fr/gtranslator/figures/message-detail.png
-share/help/fr/gtranslator/figures/mover1.png
-share/help/fr/gtranslator/figures/mover2.png
-share/help/fr/gtranslator/figures/mover3.png
-share/help/fr/gtranslator/figures/mover4.png
-share/help/fr/gtranslator/figures/mover5.png
-share/help/fr/gtranslator/figures/profiles2.png
-share/help/fr/gtranslator/figures/tm-manager.png
-share/help/fr/gtranslator/figures/use-tm-entry.png
 share/help/fr/gtranslator/gtr-add-comment-po.page
 share/help/fr/gtranslator/gtr-concepts.page
 share/help/fr/gtranslator/gtr-create-tm.page
-share/help/fr/gtranslator/gtr-custom.page
 share/help/fr/gtranslator/gtr-edit-header.page
 share/help/fr/gtranslator/gtr-edit-po.page
 share/help/fr/gtranslator/gtr-faq.page
@ -450,7 +156,6 @@ share/help/fr/gtranslator/gtr-goto-string-po.page
 share/help/fr/gtranslator/gtr-join-users.page
 share/help/fr/gtranslator/gtr-main-window.page
 share/help/fr/gtranslator/gtr-open-po.page
-share/help/fr/gtranslator/gtr-plugins.page
 share/help/fr/gtranslator/gtr-profiles.page
 share/help/fr/gtranslator/gtr-quickstart.page
 share/help/fr/gtranslator/gtr-report-problem.page
@ -460,142 +165,44 @@ share/help/fr/gtranslator/gtr-translate.page
 share/help/fr/gtranslator/gtr-use-delete-entry.page
 share/help/fr/gtranslator/gtr-wizzard.page
 share/help/fr/gtranslator/index.page
+share/help/fr/gtranslator/legal.xml
 share/help/fr/gtranslator/license.page
-share/help/gl/gtranslator/figures/Gtranslator_022.png
-share/help/gl/gtranslator/figures/Gtranslator_023.png
-share/help/gl/gtranslator/figures/Gtranslator_025.png
-share/help/gl/gtranslator/figures/Gtranslator_026.png
-share/help/gl/gtranslator/figures/Gtranslator_027.png
-share/help/gl/gtranslator/figures/add-profile.png
-share/help/gl/gtranslator/figures/comment-text.png
-share/help/gl/gtranslator/figures/edit-profile.png
-share/help/gl/gtranslator/figures/edit-text.png
-share/help/gl/gtranslator/figures/edit-toolbar.png
-share/help/gl/gtranslator/figures/edit_header.png
-share/help/gl/gtranslator/figures/edit_header2.png
-share/help/gl/gtranslator/figures/gtr-prefs-tm.png
-share/help/gl/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/gl/gtranslator/figures/gtranslator-plugins.png
-share/help/gl/gtranslator/figures/gtranslator.png
-share/help/gl/gtranslator/figures/gtranslator22.png
-share/help/gl/gtranslator/figures/gtranslator32.png
-share/help/gl/gtranslator/figures/gtranslator_interface.png
-share/help/gl/gtranslator/figures/gtranslator_tm_strings.png
-share/help/gl/gtranslator/figures/message-detail.png
-share/help/gl/gtranslator/figures/mover1.png
-share/help/gl/gtranslator/figures/mover2.png
-share/help/gl/gtranslator/figures/mover3.png
-share/help/gl/gtranslator/figures/mover4.png
-share/help/gl/gtranslator/figures/mover5.png
-share/help/gl/gtranslator/figures/profiles2.png
-share/help/gl/gtranslator/figures/tm-manager.png
-share/help/gl/gtranslator/figures/use-tm-entry.png
-share/help/gl/gtranslator/gtr-add-comment-po.page
-share/help/gl/gtranslator/gtr-concepts.page
-share/help/gl/gtranslator/gtr-create-tm.page
-share/help/gl/gtranslator/gtr-custom.page
-share/help/gl/gtranslator/gtr-edit-header.page
-share/help/gl/gtranslator/gtr-edit-po.page
-share/help/gl/gtranslator/gtr-faq.page
-share/help/gl/gtranslator/gtr-goto-string-po.page
-share/help/gl/gtranslator/gtr-join-users.page
-share/help/gl/gtranslator/gtr-main-window.page
-share/help/gl/gtranslator/gtr-open-po.page
-share/help/gl/gtranslator/gtr-plugins.page
-share/help/gl/gtranslator/gtr-profiles.page
-share/help/gl/gtranslator/gtr-quickstart.page
-share/help/gl/gtranslator/gtr-report-problem.page
-share/help/gl/gtranslator/gtr-save-po.page
-share/help/gl/gtranslator/gtr-shortcut-keys.page
-share/help/gl/gtranslator/gtr-translate.page
-share/help/gl/gtranslator/gtr-use-delete-entry.page
-share/help/gl/gtranslator/gtr-wizzard.page
-share/help/gl/gtranslator/index.page
-share/help/gl/gtranslator/license.page
-share/help/ja/gtranslator/figures/Gtranslator_022.png
-share/help/ja/gtranslator/figures/Gtranslator_023.png
-share/help/ja/gtranslator/figures/Gtranslator_025.png
-share/help/ja/gtranslator/figures/Gtranslator_026.png
-share/help/ja/gtranslator/figures/Gtranslator_027.png
-share/help/ja/gtranslator/figures/add-profile.png
-share/help/ja/gtranslator/figures/comment-text.png
-share/help/ja/gtranslator/figures/edit-profile.png
-share/help/ja/gtranslator/figures/edit-text.png
-share/help/ja/gtranslator/figures/edit-toolbar.png
-share/help/ja/gtranslator/figures/edit_header.png
-share/help/ja/gtranslator/figures/edit_header2.png
-share/help/ja/gtranslator/figures/gtr-prefs-tm.png
-share/help/ja/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/ja/gtranslator/figures/gtranslator-plugins.png
-share/help/ja/gtranslator/figures/gtranslator.png
-share/help/ja/gtranslator/figures/gtranslator22.png
-share/help/ja/gtranslator/figures/gtranslator32.png
-share/help/ja/gtranslator/figures/gtranslator_interface.png
-share/help/ja/gtranslator/figures/gtranslator_tm_strings.png
-share/help/ja/gtranslator/figures/message-detail.png
-share/help/ja/gtranslator/figures/mover1.png
-share/help/ja/gtranslator/figures/mover2.png
-share/help/ja/gtranslator/figures/mover3.png
-share/help/ja/gtranslator/figures/mover4.png
-share/help/ja/gtranslator/figures/mover5.png
-share/help/ja/gtranslator/figures/profiles2.png
-share/help/ja/gtranslator/figures/tm-manager.png
-share/help/ja/gtranslator/figures/use-tm-entry.png
-share/help/ja/gtranslator/gtr-add-comment-po.page
-share/help/ja/gtranslator/gtr-concepts.page
-share/help/ja/gtranslator/gtr-create-tm.page
-share/help/ja/gtranslator/gtr-custom.page
-share/help/ja/gtranslator/gtr-edit-header.page
-share/help/ja/gtranslator/gtr-edit-po.page
-share/help/ja/gtranslator/gtr-faq.page
-share/help/ja/gtranslator/gtr-goto-string-po.page
-share/help/ja/gtranslator/gtr-join-users.page
-share/help/ja/gtranslator/gtr-main-window.page
-share/help/ja/gtranslator/gtr-open-po.page
-share/help/ja/gtranslator/gtr-plugins.page
-share/help/ja/gtranslator/gtr-profiles.page
-share/help/ja/gtranslator/gtr-quickstart.page
-share/help/ja/gtranslator/gtr-report-problem.page
-share/help/ja/gtranslator/gtr-save-po.page
-share/help/ja/gtranslator/gtr-shortcut-keys.page
-share/help/ja/gtranslator/gtr-translate.page
-share/help/ja/gtranslator/gtr-use-delete-entry.page
-share/help/ja/gtranslator/gtr-wizzard.page
-share/help/ja/gtranslator/index.page
-share/help/ja/gtranslator/license.page
-share/help/pt_BR/gtranslator/figures/Gtranslator_022.png
-share/help/pt_BR/gtranslator/figures/Gtranslator_023.png
-share/help/pt_BR/gtranslator/figures/Gtranslator_025.png
-share/help/pt_BR/gtranslator/figures/Gtranslator_026.png
-share/help/pt_BR/gtranslator/figures/Gtranslator_027.png
-share/help/pt_BR/gtranslator/figures/add-profile.png
-share/help/pt_BR/gtranslator/figures/comment-text.png
-share/help/pt_BR/gtranslator/figures/edit-profile.png
-share/help/pt_BR/gtranslator/figures/edit-text.png
-share/help/pt_BR/gtranslator/figures/edit-toolbar.png
-share/help/pt_BR/gtranslator/figures/edit_header.png
-share/help/pt_BR/gtranslator/figures/edit_header2.png
-share/help/pt_BR/gtranslator/figures/gtr-prefs-tm.png
-share/help/pt_BR/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/pt_BR/gtranslator/figures/gtranslator-plugins.png
-share/help/pt_BR/gtranslator/figures/gtranslator.png
-share/help/pt_BR/gtranslator/figures/gtranslator22.png
+share/help/hu/gtranslator/figures/color-8ca7ff.png
+share/help/hu/gtranslator/figures/color-8cff8e.png
+share/help/hu/gtranslator/figures/color-ff8c8c.png
+share/help/hu/gtranslator/figures/gtranslator32.png
+share/help/hu/gtranslator/figures/gtranslator_interface2.png
+share/help/hu/gtranslator/figures/gtranslator_tm_strings.png
+share/help/hu/gtranslator/gtr-add-comment-po.page
+share/help/hu/gtranslator/gtr-concepts.page
+share/help/hu/gtranslator/gtr-create-tm.page
+share/help/hu/gtranslator/gtr-edit-header.page
+share/help/hu/gtranslator/gtr-edit-po.page
+share/help/hu/gtranslator/gtr-faq.page
+share/help/hu/gtranslator/gtr-goto-string-po.page
+share/help/hu/gtranslator/gtr-join-users.page
+share/help/hu/gtranslator/gtr-main-window.page
+share/help/hu/gtranslator/gtr-open-po.page
+share/help/hu/gtranslator/gtr-profiles.page
+share/help/hu/gtranslator/gtr-quickstart.page
+share/help/hu/gtranslator/gtr-report-problem.page
+share/help/hu/gtranslator/gtr-save-po.page
+share/help/hu/gtranslator/gtr-shortcut-keys.page
+share/help/hu/gtranslator/gtr-translate.page
+share/help/hu/gtranslator/gtr-use-delete-entry.page
+share/help/hu/gtranslator/gtr-wizzard.page
+share/help/hu/gtranslator/index.page
+share/help/hu/gtranslator/legal.xml
+share/help/hu/gtranslator/license.page
+share/help/pt_BR/gtranslator/figures/color-8ca7ff.png
+share/help/pt_BR/gtranslator/figures/color-8cff8e.png
+share/help/pt_BR/gtranslator/figures/color-ff8c8c.png
 share/help/pt_BR/gtranslator/figures/gtranslator32.png
-share/help/pt_BR/gtranslator/figures/gtranslator_interface.png
+share/help/pt_BR/gtranslator/figures/gtranslator_interface2.png
 share/help/pt_BR/gtranslator/figures/gtranslator_tm_strings.png
-share/help/pt_BR/gtranslator/figures/message-detail.png
-share/help/pt_BR/gtranslator/figures/mover1.png
-share/help/pt_BR/gtranslator/figures/mover2.png
-share/help/pt_BR/gtranslator/figures/mover3.png
-share/help/pt_BR/gtranslator/figures/mover4.png
-share/help/pt_BR/gtranslator/figures/mover5.png
-share/help/pt_BR/gtranslator/figures/profiles2.png
-share/help/pt_BR/gtranslator/figures/tm-manager.png
-share/help/pt_BR/gtranslator/figures/use-tm-entry.png
 share/help/pt_BR/gtranslator/gtr-add-comment-po.page
 share/help/pt_BR/gtranslator/gtr-concepts.page
 share/help/pt_BR/gtranslator/gtr-create-tm.page
-share/help/pt_BR/gtranslator/gtr-custom.page
 share/help/pt_BR/gtranslator/gtr-edit-header.page
 share/help/pt_BR/gtranslator/gtr-edit-po.page
 share/help/pt_BR/gtranslator/gtr-faq.page
@ -603,7 +210,6 @@ share/help/pt_BR/gtranslator/gtr-goto-string-po.page
 share/help/pt_BR/gtranslator/gtr-join-users.page
 share/help/pt_BR/gtranslator/gtr-main-window.page
 share/help/pt_BR/gtranslator/gtr-open-po.page
-share/help/pt_BR/gtranslator/gtr-plugins.page
 share/help/pt_BR/gtranslator/gtr-profiles.page
 share/help/pt_BR/gtranslator/gtr-quickstart.page
 share/help/pt_BR/gtranslator/gtr-report-problem.page
@ -613,40 +219,17 @@ share/help/pt_BR/gtranslator/gtr-translate.page
 share/help/pt_BR/gtranslator/gtr-use-delete-entry.page
 share/help/pt_BR/gtranslator/gtr-wizzard.page
 share/help/pt_BR/gtranslator/index.page
+share/help/pt_BR/gtranslator/legal.xml
 share/help/pt_BR/gtranslator/license.page
-share/help/ru/gtranslator/figures/Gtranslator_022.png
-share/help/ru/gtranslator/figures/Gtranslator_023.png
-share/help/ru/gtranslator/figures/Gtranslator_025.png
-share/help/ru/gtranslator/figures/Gtranslator_026.png
-share/help/ru/gtranslator/figures/Gtranslator_027.png
-share/help/ru/gtranslator/figures/add-profile.png
-share/help/ru/gtranslator/figures/comment-text.png
-share/help/ru/gtranslator/figures/edit-profile.png
-share/help/ru/gtranslator/figures/edit-text.png
-share/help/ru/gtranslator/figures/edit-toolbar.png
-share/help/ru/gtranslator/figures/edit_header.png
-share/help/ru/gtranslator/figures/edit_header2.png
-share/help/ru/gtranslator/figures/gtr-prefs-tm.png
-share/help/ru/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/ru/gtranslator/figures/gtranslator-plugins.png
-share/help/ru/gtranslator/figures/gtranslator.png
-share/help/ru/gtranslator/figures/gtranslator22.png
+share/help/ru/gtranslator/figures/color-8ca7ff.png
+share/help/ru/gtranslator/figures/color-8cff8e.png
+share/help/ru/gtranslator/figures/color-ff8c8c.png
 share/help/ru/gtranslator/figures/gtranslator32.png
-share/help/ru/gtranslator/figures/gtranslator_interface.png
+share/help/ru/gtranslator/figures/gtranslator_interface2.png
 share/help/ru/gtranslator/figures/gtranslator_tm_strings.png
-share/help/ru/gtranslator/figures/message-detail.png
-share/help/ru/gtranslator/figures/mover1.png
-share/help/ru/gtranslator/figures/mover2.png
-share/help/ru/gtranslator/figures/mover3.png
-share/help/ru/gtranslator/figures/mover4.png
-share/help/ru/gtranslator/figures/mover5.png
-share/help/ru/gtranslator/figures/profiles2.png
-share/help/ru/gtranslator/figures/tm-manager.png
-share/help/ru/gtranslator/figures/use-tm-entry.png
 share/help/ru/gtranslator/gtr-add-comment-po.page
 share/help/ru/gtranslator/gtr-concepts.page
 share/help/ru/gtranslator/gtr-create-tm.page
-share/help/ru/gtranslator/gtr-custom.page
 share/help/ru/gtranslator/gtr-edit-header.page
 share/help/ru/gtranslator/gtr-edit-po.page
 share/help/ru/gtranslator/gtr-faq.page
@ -654,7 +237,6 @@ share/help/ru/gtranslator/gtr-goto-string-po.page
 share/help/ru/gtranslator/gtr-join-users.page
 share/help/ru/gtranslator/gtr-main-window.page
 share/help/ru/gtranslator/gtr-open-po.page
-share/help/ru/gtranslator/gtr-plugins.page
 share/help/ru/gtranslator/gtr-profiles.page
 share/help/ru/gtranslator/gtr-quickstart.page
 share/help/ru/gtranslator/gtr-report-problem.page
@ -664,217 +246,37 @@ share/help/ru/gtranslator/gtr-translate.page
 share/help/ru/gtranslator/gtr-use-delete-entry.page
 share/help/ru/gtranslator/gtr-wizzard.page
 share/help/ru/gtranslator/index.page
+share/help/ru/gtranslator/legal.xml
 share/help/ru/gtranslator/license.page
-share/help/sl/gtranslator/figures/Gtranslator_022.png
-share/help/sl/gtranslator/figures/Gtranslator_023.png
-share/help/sl/gtranslator/figures/Gtranslator_025.png
-share/help/sl/gtranslator/figures/Gtranslator_026.png
-share/help/sl/gtranslator/figures/Gtranslator_027.png
-share/help/sl/gtranslator/figures/add-profile.png
-share/help/sl/gtranslator/figures/comment-text.png
-share/help/sl/gtranslator/figures/edit-profile.png
-share/help/sl/gtranslator/figures/edit-text.png
-share/help/sl/gtranslator/figures/edit-toolbar.png
-share/help/sl/gtranslator/figures/edit_header.png
-share/help/sl/gtranslator/figures/edit_header2.png
-share/help/sl/gtranslator/figures/gtr-prefs-tm.png
-share/help/sl/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/sl/gtranslator/figures/gtranslator-plugins.png
-share/help/sl/gtranslator/figures/gtranslator.png
-share/help/sl/gtranslator/figures/gtranslator22.png
-share/help/sl/gtranslator/figures/gtranslator32.png
-share/help/sl/gtranslator/figures/gtranslator_interface.png
-share/help/sl/gtranslator/figures/gtranslator_tm_strings.png
-share/help/sl/gtranslator/figures/message-detail.png
-share/help/sl/gtranslator/figures/mover1.png
-share/help/sl/gtranslator/figures/mover2.png
-share/help/sl/gtranslator/figures/mover3.png
-share/help/sl/gtranslator/figures/mover4.png
-share/help/sl/gtranslator/figures/mover5.png
-share/help/sl/gtranslator/figures/profiles2.png
-share/help/sl/gtranslator/figures/tm-manager.png
-share/help/sl/gtranslator/figures/use-tm-entry.png
-share/help/sl/gtranslator/gtr-add-comment-po.page
-share/help/sl/gtranslator/gtr-concepts.page
-share/help/sl/gtranslator/gtr-create-tm.page
-share/help/sl/gtranslator/gtr-custom.page
-share/help/sl/gtranslator/gtr-edit-header.page
-share/help/sl/gtranslator/gtr-edit-po.page
-share/help/sl/gtranslator/gtr-faq.page
-share/help/sl/gtranslator/gtr-goto-string-po.page
-share/help/sl/gtranslator/gtr-join-users.page
-share/help/sl/gtranslator/gtr-main-window.page
-share/help/sl/gtranslator/gtr-open-po.page
-share/help/sl/gtranslator/gtr-plugins.page
-share/help/sl/gtranslator/gtr-profiles.page
-share/help/sl/gtranslator/gtr-quickstart.page
-share/help/sl/gtranslator/gtr-report-problem.page
-share/help/sl/gtranslator/gtr-save-po.page
-share/help/sl/gtranslator/gtr-shortcut-keys.page
-share/help/sl/gtranslator/gtr-translate.page
-share/help/sl/gtranslator/gtr-use-delete-entry.page
-share/help/sl/gtranslator/gtr-wizzard.page
-share/help/sl/gtranslator/index.page
-share/help/sl/gtranslator/license.page
-share/help/th/gtranslator/figures/Gtranslator_022.png
-share/help/th/gtranslator/figures/Gtranslator_023.png
-share/help/th/gtranslator/figures/Gtranslator_025.png
-share/help/th/gtranslator/figures/Gtranslator_026.png
-share/help/th/gtranslator/figures/Gtranslator_027.png
-share/help/th/gtranslator/figures/add-profile.png
-share/help/th/gtranslator/figures/comment-text.png
-share/help/th/gtranslator/figures/edit-profile.png
-share/help/th/gtranslator/figures/edit-text.png
-share/help/th/gtranslator/figures/edit-toolbar.png
-share/help/th/gtranslator/figures/edit_header.png
-share/help/th/gtranslator/figures/edit_header2.png
-share/help/th/gtranslator/figures/gtr-prefs-tm.png
-share/help/th/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/th/gtranslator/figures/gtranslator-plugins.png
-share/help/th/gtranslator/figures/gtranslator.png
-share/help/th/gtranslator/figures/gtranslator22.png
-share/help/th/gtranslator/figures/gtranslator32.png
-share/help/th/gtranslator/figures/gtranslator_interface.png
-share/help/th/gtranslator/figures/gtranslator_tm_strings.png
-share/help/th/gtranslator/figures/message-detail.png
-share/help/th/gtranslator/figures/mover1.png
-share/help/th/gtranslator/figures/mover2.png
-share/help/th/gtranslator/figures/mover3.png
-share/help/th/gtranslator/figures/mover4.png
-share/help/th/gtranslator/figures/mover5.png
-share/help/th/gtranslator/figures/profiles2.png
-share/help/th/gtranslator/figures/tm-manager.png
-share/help/th/gtranslator/figures/use-tm-entry.png
-share/help/th/gtranslator/gtr-add-comment-po.page
-share/help/th/gtranslator/gtr-concepts.page
-share/help/th/gtranslator/gtr-create-tm.page
-share/help/th/gtranslator/gtr-custom.page
-share/help/th/gtranslator/gtr-edit-header.page
-share/help/th/gtranslator/gtr-edit-po.page
-share/help/th/gtranslator/gtr-faq.page
-share/help/th/gtranslator/gtr-goto-string-po.page
-share/help/th/gtranslator/gtr-join-users.page
-share/help/th/gtranslator/gtr-main-window.page
-share/help/th/gtranslator/gtr-open-po.page
-share/help/th/gtranslator/gtr-plugins.page
-share/help/th/gtranslator/gtr-profiles.page
-share/help/th/gtranslator/gtr-quickstart.page
-share/help/th/gtranslator/gtr-report-problem.page
-share/help/th/gtranslator/gtr-save-po.page
-share/help/th/gtranslator/gtr-shortcut-keys.page
-share/help/th/gtranslator/gtr-translate.page
-share/help/th/gtranslator/gtr-use-delete-entry.page
-share/help/th/gtranslator/gtr-wizzard.page
-share/help/th/gtranslator/index.page
-share/help/th/gtranslator/license.page
-share/help/uk/gtranslator/figures/Gtranslator_022.png
-share/help/uk/gtranslator/figures/Gtranslator_023.png
-share/help/uk/gtranslator/figures/Gtranslator_025.png
-share/help/uk/gtranslator/figures/Gtranslator_026.png
-share/help/uk/gtranslator/figures/Gtranslator_027.png
-share/help/uk/gtranslator/figures/add-profile.png
-share/help/uk/gtranslator/figures/comment-text.png
-share/help/uk/gtranslator/figures/edit-profile.png
-share/help/uk/gtranslator/figures/edit-text.png
-share/help/uk/gtranslator/figures/edit-toolbar.png
-share/help/uk/gtranslator/figures/edit_header.png
-share/help/uk/gtranslator/figures/edit_header2.png
-share/help/uk/gtranslator/figures/gtr-prefs-tm.png
-share/help/uk/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/uk/gtranslator/figures/gtranslator-plugins.png
-share/help/uk/gtranslator/figures/gtranslator.png
-share/help/uk/gtranslator/figures/gtranslator22.png
-share/help/uk/gtranslator/figures/gtranslator32.png
-share/help/uk/gtranslator/figures/gtranslator_interface.png
-share/help/uk/gtranslator/figures/gtranslator_tm_strings.png
-share/help/uk/gtranslator/figures/message-detail.png
-share/help/uk/gtranslator/figures/mover1.png
-share/help/uk/gtranslator/figures/mover2.png
-share/help/uk/gtranslator/figures/mover3.png
-share/help/uk/gtranslator/figures/mover4.png
-share/help/uk/gtranslator/figures/mover5.png
-share/help/uk/gtranslator/figures/profiles2.png
-share/help/uk/gtranslator/figures/tm-manager.png
-share/help/uk/gtranslator/figures/use-tm-entry.png
-share/help/uk/gtranslator/gtr-add-comment-po.page
-share/help/uk/gtranslator/gtr-concepts.page
-share/help/uk/gtranslator/gtr-create-tm.page
-share/help/uk/gtranslator/gtr-custom.page
-share/help/uk/gtranslator/gtr-edit-header.page
-share/help/uk/gtranslator/gtr-edit-po.page
-share/help/uk/gtranslator/gtr-faq.page
-share/help/uk/gtranslator/gtr-goto-string-po.page
-share/help/uk/gtranslator/gtr-join-users.page
-share/help/uk/gtranslator/gtr-main-window.page
-share/help/uk/gtranslator/gtr-open-po.page
-share/help/uk/gtranslator/gtr-plugins.page
-share/help/uk/gtranslator/gtr-profiles.page
-share/help/uk/gtranslator/gtr-quickstart.page
-share/help/uk/gtranslator/gtr-report-problem.page
-share/help/uk/gtranslator/gtr-save-po.page
-share/help/uk/gtranslator/gtr-shortcut-keys.page
-share/help/uk/gtranslator/gtr-translate.page
-share/help/uk/gtranslator/gtr-use-delete-entry.page
-share/help/uk/gtranslator/gtr-wizzard.page
-share/help/uk/gtranslator/index.page
-share/help/uk/gtranslator/license.page
-share/help/zh_CN/gtranslator/figures/Gtranslator_022.png
-share/help/zh_CN/gtranslator/figures/Gtranslator_023.png
-share/help/zh_CN/gtranslator/figures/Gtranslator_025.png
-share/help/zh_CN/gtranslator/figures/Gtranslator_026.png
-share/help/zh_CN/gtranslator/figures/Gtranslator_027.png
-share/help/zh_CN/gtranslator/figures/add-profile.png
-share/help/zh_CN/gtranslator/figures/comment-text.png
-share/help/zh_CN/gtranslator/figures/edit-profile.png
-share/help/zh_CN/gtranslator/figures/edit-text.png
-share/help/zh_CN/gtranslator/figures/edit-toolbar.png
-share/help/zh_CN/gtranslator/figures/edit_header.png
-share/help/zh_CN/gtranslator/figures/edit_header2.png
-share/help/zh_CN/gtranslator/figures/gtr-prefs-tm.png
-share/help/zh_CN/gtranslator/figures/gtrans_go_to_string_menu.png
-share/help/zh_CN/gtranslator/figures/gtranslator-plugins.png
-share/help/zh_CN/gtranslator/figures/gtranslator.png
-share/help/zh_CN/gtranslator/figures/gtranslator22.png
-share/help/zh_CN/gtranslator/figures/gtranslator32.png
-share/help/zh_CN/gtranslator/figures/gtranslator_interface.png
-share/help/zh_CN/gtranslator/figures/gtranslator_tm_strings.png
-share/help/zh_CN/gtranslator/figures/message-detail.png
-share/help/zh_CN/gtranslator/figures/mover1.png
-share/help/zh_CN/gtranslator/figures/mover2.png
-share/help/zh_CN/gtranslator/figures/mover3.png
-share/help/zh_CN/gtranslator/figures/mover4.png
-share/help/zh_CN/gtranslator/figures/mover5.png
-share/help/zh_CN/gtranslator/figures/profiles2.png
-share/help/zh_CN/gtranslator/figures/tm-manager.png
-share/help/zh_CN/gtranslator/figures/use-tm-entry.png
-share/help/zh_CN/gtranslator/gtr-add-comment-po.page
-share/help/zh_CN/gtranslator/gtr-concepts.page
-share/help/zh_CN/gtranslator/gtr-create-tm.page
-share/help/zh_CN/gtranslator/gtr-custom.page
-share/help/zh_CN/gtranslator/gtr-edit-header.page
-share/help/zh_CN/gtranslator/gtr-edit-po.page
-share/help/zh_CN/gtranslator/gtr-faq.page
-share/help/zh_CN/gtranslator/gtr-goto-string-po.page
-share/help/zh_CN/gtranslator/gtr-join-users.page
-share/help/zh_CN/gtranslator/gtr-main-window.page
-share/help/zh_CN/gtranslator/gtr-open-po.page
-share/help/zh_CN/gtranslator/gtr-plugins.page
-share/help/zh_CN/gtranslator/gtr-profiles.page
-share/help/zh_CN/gtranslator/gtr-quickstart.page
-share/help/zh_CN/gtranslator/gtr-report-problem.page
-share/help/zh_CN/gtranslator/gtr-save-po.page
-share/help/zh_CN/gtranslator/gtr-shortcut-keys.page
-share/help/zh_CN/gtranslator/gtr-translate.page
-share/help/zh_CN/gtranslator/gtr-use-delete-entry.page
-share/help/zh_CN/gtranslator/gtr-wizzard.page
-share/help/zh_CN/gtranslator/index.page
-share/help/zh_CN/gtranslator/license.page
-share/icons/hicolor/16x16/apps/gtranslator.png
-share/icons/hicolor/22x22/apps/gtranslator.png
-share/icons/hicolor/24x24/apps/gtranslator.png
-share/icons/hicolor/32x32/apps/gtranslator.png
-share/icons/hicolor/48x48/apps/gtranslator.png
-share/icons/hicolor/scalable/apps/gtranslator.svg
+share/help/sv/gtranslator/figures/color-8ca7ff.png
+share/help/sv/gtranslator/figures/color-8cff8e.png
+share/help/sv/gtranslator/figures/color-ff8c8c.png
+share/help/sv/gtranslator/figures/gtranslator32.png
+share/help/sv/gtranslator/figures/gtranslator_interface2.png
+share/help/sv/gtranslator/figures/gtranslator_tm_strings.png
+share/help/sv/gtranslator/gtr-add-comment-po.page
+share/help/sv/gtranslator/gtr-concepts.page
+share/help/sv/gtranslator/gtr-create-tm.page
+share/help/sv/gtranslator/gtr-edit-header.page
+share/help/sv/gtranslator/gtr-edit-po.page
+share/help/sv/gtranslator/gtr-faq.page
+share/help/sv/gtranslator/gtr-goto-string-po.page
+share/help/sv/gtranslator/gtr-join-users.page
+share/help/sv/gtranslator/gtr-main-window.page
+share/help/sv/gtranslator/gtr-open-po.page
+share/help/sv/gtranslator/gtr-profiles.page
+share/help/sv/gtranslator/gtr-quickstart.page
+share/help/sv/gtranslator/gtr-report-problem.page
+share/help/sv/gtranslator/gtr-save-po.page
+share/help/sv/gtranslator/gtr-shortcut-keys.page
+share/help/sv/gtranslator/gtr-translate.page
+share/help/sv/gtranslator/gtr-use-delete-entry.page
+share/help/sv/gtranslator/gtr-wizzard.page
+share/help/sv/gtranslator/index.page
+share/help/sv/gtranslator/legal.xml
+share/help/sv/gtranslator/license.page
+share/icons/hicolor/scalable/apps/org.gnome.Gtranslator.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Gtranslator-symbolic.svg
 share/locale/am/LC_MESSAGES/gtranslator.mo
 share/locale/ar/LC_MESSAGES/gtranslator.mo
 share/locale/az/LC_MESSAGES/gtranslator.mo
@ -897,6 +299,7 @@ share/locale/eu/LC_MESSAGES/gtranslator.mo
 share/locale/fa/LC_MESSAGES/gtranslator.mo
 share/locale/fi/LC_MESSAGES/gtranslator.mo
 share/locale/fr/LC_MESSAGES/gtranslator.mo
+share/locale/fur/LC_MESSAGES/gtranslator.mo
 share/locale/ga/LC_MESSAGES/gtranslator.mo
 share/locale/gl/LC_MESSAGES/gtranslator.mo
 share/locale/he/LC_MESSAGES/gtranslator.mo
@ -939,3 +342,12 @@ share/locale/wa/LC_MESSAGES/gtranslator.mo
 share/locale/zh_CN/LC_MESSAGES/gtranslator.mo
 share/locale/zh_HK/LC_MESSAGES/gtranslator.mo
 share/locale/zh_TW/LC_MESSAGES/gtranslator.mo
+share/metainfo/org.gnome.Gtranslator.appdata.xml
+share/pixmaps/gtranslator-fuzzy-next.png
+share/pixmaps/gtranslator-fuzzy-prev.png
+share/pixmaps/gtranslator-fuzzy-untranslated-next.png
+share/pixmaps/gtranslator-fuzzy-untranslated-prev.png
+share/pixmaps/gtranslator-logo.png
+share/pixmaps/gtranslator-plugin.png
+share/pixmaps/gtranslator-untranslated-next.png
+share/pixmaps/gtranslator-untranslated-prev.png
--- a/devel/jsonrpc-glib/Makefile
+++ b/devel/jsonrpc-glib/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	jsonrpc-glib
-PORTVERSION=	3.28.1
-PORTREVISION=	1
+PORTVERSION=	3.38.0
 CATEGORIES=	devel
 MASTER_SITES=	GNOME

--- a/devel/jsonrpc-glib/distinfo
+++ b/devel/jsonrpc-glib/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1529614407
-SHA256 (jsonrpc-glib-3.28.1.tar.xz) = cf2ac25944c3990904d63999deea3add38d99ea2fad16f335a996fd9a8706e2b
-SIZE (jsonrpc-glib-3.28.1.tar.xz) = 40328
+TIMESTAMP = 1600346939
+SHA256 (jsonrpc-glib-3.38.0.tar.xz) = dc5f1914a91152b70fa8fc9a11ede13148ab4af644db27a36632388c927a8a82
+SIZE (jsonrpc-glib-3.38.0.tar.xz) = 42224
--- a/devel/jsonrpc-glib/pkg-plist
+++ b/devel/jsonrpc-glib/pkg-plist
@ -10,7 +10,7 @@ include/jsonrpc-glib-1.0/jsonrpc-version.h
 lib/girepository-1.0/Jsonrpc-1.0.typelib
 lib/libjsonrpc-glib-1.0.so
 lib/libjsonrpc-glib-1.0.so.1
-lib/libjsonrpc-glib-1.0.so.1.2800.1
+lib/libjsonrpc-glib-1.0.so.1.3800.0
 libdata/pkgconfig/jsonrpc-glib-1.0.pc
 share/gir-1.0/Jsonrpc-1.0.gir
 share/vala/vapi/jsonrpc-glib-1.0.deps
--- a/devel/lfcxml/Makefile
+++ b/devel/lfcxml/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	lfcxml
-PORTVERSION=	1.2.10
+PORTVERSION=	1.2.11
 CATEGORIES=	devel
 MASTER_SITES=	http://www.lemke-it.com/

--- a/devel/lfcxml/distinfo
+++ b/devel/lfcxml/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1555832511
-SHA256 (lfcxml-1.2.10.tar.gz) = 11cb6e26c866ebd3d3c6527b2bba79d2e2d1f63f57ec606a0a8d503f98817aab
-SIZE (lfcxml-1.2.10.tar.gz) = 511345
+TIMESTAMP = 1600326407
+SHA256 (lfcxml-1.2.11.tar.gz) = 073f0095e1df2f74f5a986e78aa86ed754a54e695126e47fd267ed6d4913a788
+SIZE (lfcxml-1.2.11.tar.gz) = 511601
--- a/devel/liblouis/Makefile
+++ b/devel/liblouis/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	liblouis
-PORTVERSION=	3.12.0
+PORTVERSION=	3.15.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel

--- a/devel/liblouis/distinfo
+++ b/devel/liblouis/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1575738749
-SHA256 (liblouis-liblouis-v3.12.0_GH0.tar.gz) = b985102f49e209baeb6ea2f26cf24cd7cb2b70cca1e5e270dc25d5354c2b81c9
-SIZE (liblouis-liblouis-v3.12.0_GH0.tar.gz) = 13724124
+TIMESTAMP = 1600341135
+SHA256 (liblouis-liblouis-v3.15.0_GH0.tar.gz) = dfd2e89ad2de05c791dbe97368bd2dc7c5e8c26e1f10621dc5c7bc5ded4895b9
+SIZE (liblouis-liblouis-v3.15.0_GH0.tar.gz) = 14181229
--- a/devel/liblouis/pkg-plist
+++ b/devel/liblouis/pkg-plist
@ -9,6 +9,8 @@
 %%DATADIR%%/tables/ar-ar-comp8.utb
 %%DATADIR%%/tables/ar-ar-g1.utb
 %%DATADIR%%/tables/ar-ar-g2.ctb
+%%DATADIR%%/tables/ar-ar-g1-core.uti
+%%DATADIR%%/tables/ar-ar-math.uti
 %%DATADIR%%/tables/ar.tbl
 %%DATADIR%%/tables/as-in-g1.utb
 %%DATADIR%%/tables/as.tbl
@ -37,6 +39,7 @@
 %%DATADIR%%/tables/ckb-translation.cti
 %%DATADIR%%/tables/compress.cti
 %%DATADIR%%/tables/controlchars.cti
+%%DATADIR%%/tables/cop-eg-comp8.utb
 %%DATADIR%%/tables/corrections.cti
 %%DATADIR%%/tables/countries.cti
 %%DATADIR%%/tables/cs-chardefs.cti
@ -50,7 +53,6 @@
 %%DATADIR%%/tables/cy.tbl
 %%DATADIR%%/tables/da-dk-6miscChars.cti
 %%DATADIR%%/tables/da-dk-8miscChars.cti
-%%DATADIR%%/tables/da-dk.dis
 %%DATADIR%%/tables/da-dk-g08.ctb
 %%DATADIR%%/tables/da-dk-g16.ctb
 %%DATADIR%%/tables/da-dk-g16-lit.ctb
@ -62,7 +64,6 @@
 %%DATADIR%%/tables/da-dk-g28.ctb
 %%DATADIR%%/tables/da-dk-g28l.ctb
 %%DATADIR%%/tables/da-dk-octobraille.dis
-%%DATADIR%%/tables/da-lt.ctb
 %%DATADIR%%/tables/de-accents-detailed.cti
 %%DATADIR%%/tables/de-accents.cti
 %%DATADIR%%/tables/de-chardefs6.cti
@ -73,6 +74,10 @@
 %%DATADIR%%/tables/de-eurobrl6.dis
 %%DATADIR%%/tables/de-eurobrl6u.dis
 %%DATADIR%%/tables/de-g0-core.uti
+%%DATADIR%%/tables/de-g0-bidi-core.uti
+%%DATADIR%%/tables/de-g0-bidi.utb
+%%DATADIR%%/tables/de-g1-bidi-core.cti
+%%DATADIR%%/tables/de-g1-bidi.ctb
 %%DATADIR%%/tables/de-g1-core.cti
 %%DATADIR%%/tables/de-g2-core.cti
 %%DATADIR%%/tables/de-g0.utb
@ -128,8 +133,6 @@
 %%DATADIR%%/tables/eurodefs.cti
 %%DATADIR%%/tables/fa-ir-comp8.ctb
 %%DATADIR%%/tables/fa-ir-g1.utb
-%%DATADIR%%/tables/fi1.ctb
-%%DATADIR%%/tables/fi2.ctb
 %%DATADIR%%/tables/fi-fi-8dot.ctb
 %%DATADIR%%/tables/fi.utb
 %%DATADIR%%/tables/fr-bfu-comp68.cti
@ -155,6 +158,8 @@
 %%DATADIR%%/tables/haw-us-g1.ctb
 %%DATADIR%%/tables/he.ctb
 %%DATADIR%%/tables/he.tbl
+%%DATADIR%%/tables/he-IL-comp8.utb
+%%DATADIR%%/tables/he-IL.utb
 %%DATADIR%%/tables/hi-in-g1.utb
 %%DATADIR%%/tables/hi.tbl
 %%DATADIR%%/tables/hr-chardefs.cti
@ -243,6 +248,7 @@
 %%DATADIR%%/tables/mni.tbl
 %%DATADIR%%/tables/mr-in-g1.utb
 %%DATADIR%%/tables/mr.tbl
+%%DATADIR%%/tables/ms-my-g2.ctb
 %%DATADIR%%/tables/mt.ctb
 %%DATADIR%%/tables/mt.tbl
 %%DATADIR%%/tables/mun.ctb
@ -343,6 +349,7 @@
 %%DATADIR%%/tables/ukmaths_single_cell_defs.cti
 %%DATADIR%%/tables/ukmaths_unicode_defs.cti
 %%DATADIR%%/tables/uk.utb
+%%DATADIR%%/tables/uk-comp.utb
 %%DATADIR%%/tables/unicode-braille.utb
 %%DATADIR%%/tables/unicode.dis
 %%DATADIR%%/tables/unicode-without-blank.dis
@ -350,10 +357,12 @@
 %%DATADIR%%/tables/ur-pk-g1.utb
 %%DATADIR%%/tables/ur-pk-g2.ctb
 %%DATADIR%%/tables/us-table.dis
+%%DATADIR%%/tables/uz-g1.utb
 %%DATADIR%%/tables/vi.ctb
 %%DATADIR%%/tables/vi-g1.ctb
 %%DATADIR%%/tables/vi.tbl
 %%DATADIR%%/tables/wiskunde-chardefs.cti
+%%DATADIR%%/tables/wordcx.dis
 %%DATADIR%%/tables/zh_CHN.tbl
 %%DATADIR%%/tables/zh_HK.tbl
 %%DATADIR%%/tables/zh_TW.tbl
@ -386,7 +395,7 @@ libdata/pkgconfig/liblouis.pc
 lib/liblouis.a
 lib/liblouis.so
 lib/liblouis.so.20
-lib/liblouis.so.20.0.0
+lib/liblouis.so.20.0.3
 man/man1/lou_allround.1.gz
 man/man1/lou_checkhyphens.1.gz
 man/man1/lou_checktable.1.gz
--- a/devel/py-oci/Makefile
+++ b/devel/py-oci/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	oci
-PORTVERSION=	2.21.3
+PORTVERSION=	2.21.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/Show More
+++ b/Show More