*/*: sync with upstream

Taken from: HardenedBSD
2021-02-05 21:09:31 +01:00 · 2021-02-05 21:09:31 +01:00 · feebbbd4e2
parent 44e3555077
commit feebbbd4e2
2621 changed files with 26613 additions and 26997 deletions
--- a/archivers/py-borgbackup/Makefile
+++ b/archivers/py-borgbackup/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	borgbackup
-DISTVERSION=	1.1.14
+DISTVERSION=	1.1.15
 CATEGORIES=	archivers python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -15,9 +15,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR}
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
-		libzstd.so:archivers/zstd
+		libzstd.so:archivers/zstd \
+		libxxhash.so:devel/xxhash

-USES=		python:3.4+ ssl
+USES=		python:3.5+ ssl
 USE_PYTHON=	autoplist distutils

 OPTIONS_DEFINE=		FUSE
--- a/archivers/py-borgbackup/distinfo
+++ b/archivers/py-borgbackup/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1602069731
-SHA256 (borgbackup-1.1.14.tar.gz) = 7dbb0747cc948673f695cd6de284af215f810fed2eb2a615ef26ddc7c691edba
-SIZE (borgbackup-1.1.14.tar.gz) = 3769460
+TIMESTAMP = 1612558546
+SHA256 (borgbackup-1.1.15.tar.gz) = 49cb9eed98b8e32ae3b97beaedf94cdff46f796445043f1923fd0fce7ed3c2bc
+SIZE (borgbackup-1.1.15.tar.gz) = 3777355
--- a/astro/p5-Astro-Sunrise/Makefile
+++ b/astro/p5-Astro-Sunrise/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Astro-Sunrise
-PORTVERSION=	0.98
+PORTVERSION=	0.99
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/astro/p5-Astro-Sunrise/distinfo
+++ b/astro/p5-Astro-Sunrise/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1547904110
-SHA256 (Astro-Sunrise-0.98.tar.gz) = b25d947f21fd9c1c045f6792c34217b6f56a778d118b83dd7105b807d8c234c2
-SIZE (Astro-Sunrise-0.98.tar.gz) = 177806
+TIMESTAMP = 1612567860
+SHA256 (Astro-Sunrise-0.99.tar.gz) = 1a30210dba02234ace15b0ff289a168d5ff9bab0f118f9498ae2dc0df71653ac
+SIZE (Astro-Sunrise-0.99.tar.gz) = 191038
--- a/audio/Makefile
+++ b/audio/Makefile
@ -25,6 +25,7 @@
    SUBDIR += alure
    SUBDIR += amarok
    SUBDIR += amb-plugins
+    SUBDIR += ampache
    SUBDIR += ample
    SUBDIR += amsynth
    SUBDIR += aqualung
@ -676,6 +677,7 @@
    SUBDIR += ripit
    SUBDIR += ripperx
    SUBDIR += rkr-lv2
+    SUBDIR += rnnoise
    SUBDIR += rnnoise-nu
    SUBDIR += rosegarden
    SUBDIR += rplay
--- a/audio/ampache/Makefile
+++ b/audio/ampache/Makefile
@ -0,0 +1,46 @@
+# Created by: Philippe Audeoud <jadawin@tuxaco.net>
+# $FreeBSD$
+
+PORTNAME=	ampache
+PORTVERSION=	4.3.0
+DISTVERSIONSUFFIX=	_all
+CATEGORIES=	audio www
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
+PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
+
+MAINTAINER=	crees@FreeBSD.org
+COMMENT=	Web-based Audio file manager
+
+LICENSE=	AGPLv3+
+
+USES=		zip gettext php:flavors mysql
+USE_PHP=	pdo pdo_mysql hash session json intl simplexml curl dom xml
+
+NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
+SUB_FILES=	500.ampache-cron
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+.for h in channel play rest
+	${REINPLACE_CMD} 's,[[:space:]]*RewriteRule [^[:space:]]*[[:space:]],&/ampache,'	\
+		${WRKSRC}/$h/.htaccess.dist
+.endfor
+	${REINPLACE_CMD} 's,^;web_path = "",web_path = "/${PORTNAME}",'	\
+		${WRKSRC}/config/ampache.cfg.php.dist
+
+do-build:
+	${MKDIR} ${WRKSRC}/src
+
+do-install:
+	${MKDIR} ${STAGEDIR}${WWWDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} '-not -regex ^./man.*')
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} '-not -regex ^./docs.* -a -not -name *.bak')
+	${INSTALL_MAN} ${WRKSRC}/docs/man/man1/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
+	${INSTALL_SCRIPT} ${WRKDIR}/500.ampache-cron ${STAGEDIR}${PREFIX}/etc/periodic/daily/
+
+.include <bsd.port.mk>
--- a/audio/ampache/distinfo
+++ b/audio/ampache/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1612622345
+SHA256 (ampache-4.3.0_all.zip) = 51cee899a93c8bfe8a1b495a6fadce2f4e1973969e434452ab04221f5eebd0e8
+SIZE (ampache-4.3.0_all.zip) = 62752685
--- a/audio/ampache/files/500.ampache-cron.in
+++ b/audio/ampache/files/500.ampache-cron.in
@ -0,0 +1,27 @@
+#!/bin/sh -
+#
+# $FreeBSD$
+#
+
+if [ -r /etc/defaults/periodic.conf ]; then
+	. /etc/defaults/periodic.conf
+	source_periodic_confs
+fi
+
+rc=0
+
+case "${daily_ampache_gc_enable:-no}" in
+[Nn][Oo])
+	;;
+*)
+	phpcmd=%%LOCALBASE%%/bin/php
+	cronscript=%%WWWDIR%%/bin/cron.inc
+
+	if ! $phpcmd $cronscript >/dev/null 2>&1 ; then
+		echo 'ampache cron script failed- try running it manually'
+		rc=2
+	fi
+	;;
+esac
+
+exit $rc
--- a/audio/ampache/pkg-descr
+++ b/audio/ampache/pkg-descr
@ -0,0 +1,8 @@
+Ampache is a Web-based Audio file manager. It is implemented with MySQL,
+and PHP. It allows you to view, edit, and play your audio files via the
+web. It has support for playlists, artist and album views, album art,
+random play, playback via Http/On the Fly Transcoding and Downsampling,
+Vote based playback, Mpd and Icecast, Integrated Flash Player, as well
+as per user themes and song play tracking.
+
+WWW: http://ampache.org/
--- a/audio/ampache/pkg-message
+++ b/audio/ampache/pkg-message
@ -0,0 +1,9 @@
+[
+{ type: install
+  message: <<EOM
+It is recommended to run the garbage collection daily:
+
+# echo daily_ampache_gc_enable=yes >> /etc/periodic.conf
+EOM
+}
+]
--- a/audio/ampache/pkg-plist
+++ b/audio/ampache/pkg-plist
--- a/audio/bchoppr-lv2/Makefile
+++ b/audio/bchoppr-lv2/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	bchoppr
-DISTVERSION=	1.10.2-3
-DISTVERSIONSUFFIX=	-gdfdece8
+DISTVERSION=	1.10.4
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

--- a/audio/bchoppr-lv2/distinfo
+++ b/audio/bchoppr-lv2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1612195734
-SHA256 (sjaehn-BChoppr-1.10.2-3-gdfdece8_GH0.tar.gz) = c6fe1d9e48c641147e050bafa19a1cce44e5e9ac0b08be74bd3e76d3a1184fac
-SIZE (sjaehn-BChoppr-1.10.2-3-gdfdece8_GH0.tar.gz) = 453985
+TIMESTAMP = 1612733761
+SHA256 (sjaehn-BChoppr-1.10.4_GH0.tar.gz) = d5017c54b5cddc60d7d41f83ebed18a474cae5ff39bc96c73568d37e831ee9b0
+SIZE (sjaehn-BChoppr-1.10.4_GH0.tar.gz) = 442998
--- a/audio/gonic/Makefile
+++ b/audio/gonic/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	gonic
-PORTVERSION=	0.11.1
+PORTVERSION=	0.12.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	audio net

@ -21,41 +21,50 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	sentriz
 GO_TARGET=	./cmd/gonic

-GH_TUPLE=	Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \
+GH_TUPLE=	\
+		Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \
 		Masterminds:semver:v1.5.0:masterminds_semver/vendor/github.com/Masterminds/semver \
 		Masterminds:sprig:v2.22.0:masterminds_sprig/vendor/github.com/Masterminds/sprig \
+		PuerkitoBio:goquery:v1.5.1:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \
+		andybalholm:cascadia:v1.1.0:andybalholm_cascadia/vendor/github.com/andybalholm/cascadia \
 		cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
 		disintegration:imaging:v1.6.2:disintegration_imaging/vendor/github.com/disintegration/imaging \
 		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		faiface:beep:v1.0.2:faiface_beep/vendor/github.com/faiface/beep \
 		go-check:check:788fd7840127:go_check_check/vendor/gopkg.in/check.v1 \
 		go-gormigrate:gormigrate:v1.6.0:go_gormigrate_gormigrate/vendor/gopkg.in/gormigrate.v1 \
-		golang:crypto:06a226fb4e37:golang_crypto/vendor/golang.org/x/crypto \
-		golang:exp:00229845015e:golang_exp/vendor/golang.org/x/exp \
-		golang:image:33d19683fad8:golang_image/vendor/golang.org/x/image \
-		golang:lint:959b441ac422:golang_lint/vendor/github.com/golang/lint \
-		golang:mobile:4c31acba0007:golang_mobile/vendor/golang.org/x/mobile \
-		golang:sys:fe76b779f299:golang_sys/vendor/golang.org/x/sys \
-		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
+		golang:crypto:eec23a3978ad:golang_crypto/vendor/golang.org/x/crypto \
+		golang:exp:eab1b5eb1a03:golang_exp/vendor/golang.org/x/exp \
+		golang:image:35266b937fa6:golang_image/vendor/golang.org/x/image \
+		golang:mobile:e6ae53a27f4f:golang_mobile/vendor/golang.org/x/mobile \
+		golang:net:d3edc9973b7e:golang_net/vendor/golang.org/x/net \
+		golang:sys:0d417f636930:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
+		google:uuid:v1.1.2:google_uuid/vendor/github.com/google/uuid \
 		gorilla:context:v1.1.1:gorilla_context/vendor/github.com/gorilla/context \
-		gorilla:mux:v1.7.4:gorilla_mux/vendor/github.com/gorilla/mux \
+		gorilla:mux:v1.8.0:gorilla_mux/vendor/github.com/gorilla/mux \
 		gorilla:securecookie:v1.1.1:gorilla_securecookie/vendor/github.com/gorilla/securecookie \
-		gorilla:sessions:v1.2.0:gorilla_sessions/vendor/github.com/gorilla/sessions \
-		hajimehoshi:go-mp3:v0.2.1:hajimehoshi_go_mp3/vendor/github.com/hajimehoshi/go-mp3 \
-		hajimehoshi:oto:v0.6.1:hajimehoshi_oto/vendor/github.com/hajimehoshi/oto \
-		huandu:xstrings:v1.3.1:huandu_xstrings/vendor/github.com/huandu/xstrings \
+		gorilla:sessions:v1.2.1:gorilla_sessions/vendor/github.com/gorilla/sessions \
+		hajimehoshi:go-mp3:v0.3.1:hajimehoshi_go_mp3/vendor/github.com/hajimehoshi/go-mp3 \
+		hajimehoshi:oto:v0.7.0:hajimehoshi_oto/vendor/github.com/hajimehoshi/oto \
+		huandu:xstrings:v1.3.2:huandu_xstrings/vendor/github.com/huandu/xstrings \
 		icza:bitio:v1.0.0:icza_bitio/vendor/github.com/icza/bitio \
-		imdario:mergo:v0.3.9:imdario_mergo/vendor/github.com/imdario/mergo \
-		jinzhu:gorm:v1.9.12:jinzhu_gorm/vendor/github.com/jinzhu/gorm \
+		imdario:mergo:v0.3.11:imdario_mergo/vendor/github.com/imdario/mergo \
+		jinzhu:gorm:v1.9.16:jinzhu_gorm/vendor/github.com/jinzhu/gorm \
 		jinzhu:inflection:v1.0.0:jinzhu_inflection/vendor/github.com/jinzhu/inflection \
 		josephburnett:jd:aa1a7c66b42f:josephburnett_jd/vendor/github.com/josephburnett/jd \
-		karrick:godirwalk:v1.15.6:karrick_godirwalk/vendor/github.com/karrick/godirwalk \
+		json-iterator:go:v1.1.10:json_iterator_go/vendor/github.com/json-iterator/go \
+		karrick:godirwalk:v1.16.1:karrick_godirwalk/vendor/github.com/karrick/godirwalk \
 		kr:pretty:v0.1.0:kr_pretty/vendor/github.com/kr/pretty \
 		mattn:go-sqlite3:v2.0.3:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
 		mewkiz:flac:v1.0.6:mewkiz_flac/vendor/github.com/mewkiz/flac \
-		mewkiz:pkg:f6b5e26764c3:mewkiz_pkg/vendor/github.com/mewkiz/pkg \
+		mewkiz:pkg:dd47075182ea:mewkiz_pkg/vendor/github.com/mewkiz/pkg \
 		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
 		mitchellh:reflectwalk:v1.0.1:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
+		mmcdole:gofeed:v1.1.0:mmcdole_gofeed/vendor/github.com/mmcdole/gofeed \
+		mmcdole:goxpp:0068e33feabf:mmcdole_goxpp/vendor/github.com/mmcdole/goxpp \
+		modern-go:concurrent:e0a39a4cb421:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
+		modern-go:reflect2:4b7aa43c6742:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
 		nicksellen:audiotags:94015fa599bd:nicksellen_audiotags/vendor/github.com/nicksellen/audiotags \
 		oklog:run:v1.1.0:oklog_run/vendor/github.com/oklog/run \
 		oxtoacart:bpool:03653db5a59c:oxtoacart_bpool/vendor/github.com/oxtoacart/bpool \
--- a/audio/gonic/distinfo
+++ b/audio/gonic/distinfo
@ -1,12 +1,16 @@
-TIMESTAMP = 1609151394
-SHA256 (sentriz-gonic-v0.11.1_GH0.tar.gz) = 7579b439fcb4fbb97558a0f908e7f02a21fe9804e5b7330cee9f0cbb2a7b7011
-SIZE (sentriz-gonic-v0.11.1_GH0.tar.gz) = 1116436
+TIMESTAMP = 1612671126
+SHA256 (sentriz-gonic-v0.12.0_GH0.tar.gz) = 24de6989e096a9136a9cb81534247cd9a94b7efc93604b5b3cafc64382880812
+SIZE (sentriz-gonic-v0.12.0_GH0.tar.gz) = 1130312
 SHA256 (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 053a61c4b0d78e6978600c99562f04d053993c428d549a20b627151cf1aabbae
 SIZE (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 14610
 SHA256 (Masterminds-semver-v1.5.0_GH0.tar.gz) = c9140eddfb03dc862f826e7761561260b9a840afa7519cc0919e89a43b5be5ba
 SIZE (Masterminds-semver-v1.5.0_GH0.tar.gz) = 21188
 SHA256 (Masterminds-sprig-v2.22.0_GH0.tar.gz) = c6d0f6e2a3b2aecc888b62c15defcccf16a44e7435c47c7f158b98946c5ee970
 SIZE (Masterminds-sprig-v2.22.0_GH0.tar.gz) = 42051
+SHA256 (PuerkitoBio-goquery-v1.5.1_GH0.tar.gz) = 50b671f7128ac6993b7388d4e8a76901afdcaa7c6889f45687a2acc0d0753ca4
+SIZE (PuerkitoBio-goquery-v1.5.1_GH0.tar.gz) = 101380
+SHA256 (andybalholm-cascadia-v1.1.0_GH0.tar.gz) = 5d03f4610b70cab7860b158efab1afd91baa58fd95286a0adbadcdc3b49c7936
+SIZE (andybalholm-cascadia-v1.1.0_GH0.tar.gz) = 15464
 SHA256 (cespare-xxhash-v1.1.0_GH0.tar.gz) = 9418be390574092f0ca989b9ae2f5450270ead8125a635a100850b28c8c9c495
 SIZE (cespare-xxhash-v1.1.0_GH0.tar.gz) = 8200
 SHA256 (disintegration-imaging-v1.6.2_GH0.tar.gz) = ddc0cbbf306630d39ee710ff055bb9503d30598485f76f51564ee3ae13d6611a
@ -19,58 +23,70 @@ SHA256 (go-check-check-788fd7840127_GH0.tar.gz) = b7c9de01f3ca7111d889f30f2bbcc3
 SIZE (go-check-check-788fd7840127_GH0.tar.gz) = 31597
 SHA256 (go-gormigrate-gormigrate-v1.6.0_GH0.tar.gz) = f88aa9d97e99e6463d5469fc39683f86651fb36ca55f7018f7781c552276cb27
 SIZE (go-gormigrate-gormigrate-v1.6.0_GH0.tar.gz) = 12738
-SHA256 (golang-crypto-06a226fb4e37_GH0.tar.gz) = 7a00dcb4857a42efb0d93d3cae8c33f1f05048a0ee54c7437c79b848a622833a
-SIZE (golang-crypto-06a226fb4e37_GH0.tar.gz) = 1728425
-SHA256 (golang-exp-00229845015e_GH0.tar.gz) = be8ddc6f0392ee5dbcbfc2fc1976db55c7cb6c2b92ad7377a7c4cc7c45741533
-SIZE (golang-exp-00229845015e_GH0.tar.gz) = 1513535
-SHA256 (golang-image-33d19683fad8_GH0.tar.gz) = 0aef28fccaf72d198809c6679a156268b1b243be5031586f6f269fa33256c824
-SIZE (golang-image-33d19683fad8_GH0.tar.gz) = 4896677
-SHA256 (golang-lint-959b441ac422_GH0.tar.gz) = fc9f3cfe7ba2a932975bd513c40384b2eb32f3967a130c40676d72c592e4ac1d
-SIZE (golang-lint-959b441ac422_GH0.tar.gz) = 32998
-SHA256 (golang-mobile-4c31acba0007_GH0.tar.gz) = 64000e49a33ebc7b7789779c90ab88b65b9119ccf7ee386953a4f9dc9b90710c
-SIZE (golang-mobile-4c31acba0007_GH0.tar.gz) = 1205604
-SHA256 (golang-sys-fe76b779f299_GH0.tar.gz) = 84cda22938ed183a5629979d1f16ab82aa2fab1d2bbb078b6440deada7b360f5
-SIZE (golang-sys-fe76b779f299_GH0.tar.gz) = 1052710
-SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
-SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
+SHA256 (golang-crypto-eec23a3978ad_GH0.tar.gz) = bd882536660d6b65619c9d9b9334e9a5c55557613e56e1b485323a2293dfa2f8
+SIZE (golang-crypto-eec23a3978ad_GH0.tar.gz) = 1725798
+SHA256 (golang-exp-eab1b5eb1a03_GH0.tar.gz) = 5dc058690c3dd22c2dc87b84d75beb4b37be4fd31afe339697295117bd0e0994
+SIZE (golang-exp-eab1b5eb1a03_GH0.tar.gz) = 1520609
+SHA256 (golang-image-35266b937fa6_GH0.tar.gz) = 2b626beef88229684af737e76021a9353f2302e1fa70e690453e0ef6fe06bbab
+SIZE (golang-image-35266b937fa6_GH0.tar.gz) = 4900465
+SHA256 (golang-mobile-e6ae53a27f4f_GH0.tar.gz) = ccef81999ecd3665f311569bed55624625bf80ca5a0c012ee8580447cd0ded32
+SIZE (golang-mobile-e6ae53a27f4f_GH0.tar.gz) = 1206566
+SHA256 (golang-net-d3edc9973b7e_GH0.tar.gz) = 3f1ba89024d8a03881a5f308e820f1beb0fa6f3a03eff3dca42c4cc9f59869f9
+SIZE (golang-net-d3edc9973b7e_GH0.tar.gz) = 1174466
+SHA256 (golang-sys-0d417f636930_GH0.tar.gz) = c2961d0c8ba3a867d14559a67aa318a028111f17b4ac69015bcd272cbf023881
+SIZE (golang-sys-0d417f636930_GH0.tar.gz) = 1090867
+SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
+SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
+SHA256 (google-uuid-v1.1.2_GH0.tar.gz) = e650558e314307cf33391d0a9ef575b418188206d61cb9751e9f11bceb0874d0
+SIZE (google-uuid-v1.1.2_GH0.tar.gz) = 13871
 SHA256 (gorilla-context-v1.1.1_GH0.tar.gz) = 2dfdd051c238695bf9ebfed0bf6a8c533507ac0893bce23be5930e973736bb03
 SIZE (gorilla-context-v1.1.1_GH0.tar.gz) = 4574
-SHA256 (gorilla-mux-v1.7.4_GH0.tar.gz) = 56ea3c39b8c19360357970a4dcd717485f36ac7da9c6b5a107bd4b80848c4aee
-SIZE (gorilla-mux-v1.7.4_GH0.tar.gz) = 45437
+SHA256 (gorilla-mux-v1.8.0_GH0.tar.gz) = ea2639259d2ce6f402636655e91eb93ba69c139e3cbf80b044ee393ada53757b
+SIZE (gorilla-mux-v1.8.0_GH0.tar.gz) = 45517
 SHA256 (gorilla-securecookie-v1.1.1_GH0.tar.gz) = b7897b2243f0d43913aca318593c5c2586294fcd3265189d564ddda1b880fe95
 SIZE (gorilla-securecookie-v1.1.1_GH0.tar.gz) = 41240
-SHA256 (gorilla-sessions-v1.2.0_GH0.tar.gz) = 576d154ff12273d88d25864d14bd9b0fb1a864274d1fb3e224546529068c8968
-SIZE (gorilla-sessions-v1.2.0_GH0.tar.gz) = 13352
-SHA256 (hajimehoshi-go-mp3-v0.2.1_GH0.tar.gz) = 9a55cbdf413abfbebcc8f8a7b38d1897843a69b1585cd80130961591be0b0e42
-SIZE (hajimehoshi-go-mp3-v0.2.1_GH0.tar.gz) = 11220218
-SHA256 (hajimehoshi-oto-v0.6.1_GH0.tar.gz) = 111b347495aca5ff5bb7fcc9e63cdb90ab51ed935e0dd7690bc037ff3efa1abb
-SIZE (hajimehoshi-oto-v0.6.1_GH0.tar.gz) = 24090
-SHA256 (huandu-xstrings-v1.3.1_GH0.tar.gz) = d399f03735391073441145bac6b8d06b36f3b59e005db77ebafde130ddf215bf
-SIZE (huandu-xstrings-v1.3.1_GH0.tar.gz) = 17797
+SHA256 (gorilla-sessions-v1.2.1_GH0.tar.gz) = 2234387daf91ba4318516ba3b9f73ba0d166dc5f0a45f146b918f3a4c11a3184
+SIZE (gorilla-sessions-v1.2.1_GH0.tar.gz) = 13415
+SHA256 (hajimehoshi-go-mp3-v0.3.1_GH0.tar.gz) = 3d4ed71c6633488ea799cca4e2f09188a1eecd3364946d28428437df5d2c4057
+SIZE (hajimehoshi-go-mp3-v0.3.1_GH0.tar.gz) = 11655539
+SHA256 (hajimehoshi-oto-v0.7.0_GH0.tar.gz) = 4267ef4eb5e2c8b48d45a34573d22470e38c021ae22d4eb24e9d02e08b626671
+SIZE (hajimehoshi-oto-v0.7.0_GH0.tar.gz) = 25802
+SHA256 (huandu-xstrings-v1.3.2_GH0.tar.gz) = 89eed037724f4a2e85da5217faa6d73ae317d066e0e5fd79670a142b83f5eb1b
+SIZE (huandu-xstrings-v1.3.2_GH0.tar.gz) = 17911
 SHA256 (icza-bitio-v1.0.0_GH0.tar.gz) = ddfddbfe0db08016316a3a09ec4acf76bb216d744047abb5625f1ad0c4ba761f
 SIZE (icza-bitio-v1.0.0_GH0.tar.gz) = 11010
-SHA256 (imdario-mergo-v0.3.9_GH0.tar.gz) = 962a8392b47ab758009c94bcb0b7cd7e345026954f893f90f28f2791523206ca
-SIZE (imdario-mergo-v0.3.9_GH0.tar.gz) = 18910
-SHA256 (jinzhu-gorm-v1.9.12_GH0.tar.gz) = 1aaa921e5c244e9cb186426e70fedc2c5ca17df80e247078d7a540f55961e8dc
-SIZE (jinzhu-gorm-v1.9.12_GH0.tar.gz) = 96680
+SHA256 (imdario-mergo-v0.3.11_GH0.tar.gz) = 36544167ad735d458781b89ce3c3bfd56dd6ebdeadd5f3b4e1e0c6e0ab4f2191
+SIZE (imdario-mergo-v0.3.11_GH0.tar.gz) = 22060
+SHA256 (jinzhu-gorm-v1.9.16_GH0.tar.gz) = c7ea6db55ab5226b6eb71e5654d14690459d02304df50cdf4adbe70db0308cab
+SIZE (jinzhu-gorm-v1.9.16_GH0.tar.gz) = 97157
 SHA256 (jinzhu-inflection-v1.0.0_GH0.tar.gz) = 582808364cc268544e3e6775b15d7fffbc28ccfb930a29840bb25e32d7d95e1f
 SIZE (jinzhu-inflection-v1.0.0_GH0.tar.gz) = 4766
 SHA256 (josephburnett-jd-aa1a7c66b42f_GH0.tar.gz) = 136806b8264dd77ace62692b84b7be1f8f85859c013e51710f656b9afb5b7be3
 SIZE (josephburnett-jd-aa1a7c66b42f_GH0.tar.gz) = 31891
-SHA256 (karrick-godirwalk-v1.15.6_GH0.tar.gz) = d861987afed4e6c6998ab5d502c1480390175b3dc64b2c6cdb46367c2fdc054f
-SIZE (karrick-godirwalk-v1.15.6_GH0.tar.gz) = 24756
+SHA256 (json-iterator-go-v1.1.10_GH0.tar.gz) = 15e761079f413a9edcf86ea628998e328c12aaed92af462363191fa76e9809a6
+SIZE (json-iterator-go-v1.1.10_GH0.tar.gz) = 83384
+SHA256 (karrick-godirwalk-v1.16.1_GH0.tar.gz) = a0416d5027f6ce66e6a22a9fb7d60ddc756b6e5e8f20398f3c3d43aa0092fd25
+SIZE (karrick-godirwalk-v1.16.1_GH0.tar.gz) = 27116
 SHA256 (kr-pretty-v0.1.0_GH0.tar.gz) = 3aeb5d90b719765781befb9f156d0d0b8e5a7aafbcf15321e9eabbd35df31358
 SIZE (kr-pretty-v0.1.0_GH0.tar.gz) = 8550
 SHA256 (mattn-go-sqlite3-v2.0.3_GH0.tar.gz) = ed015860c9b3e701d8cce7dcb0bcb2e2f53071718334465b10abb696f7de0e58
 SIZE (mattn-go-sqlite3-v2.0.3_GH0.tar.gz) = 2335418
 SHA256 (mewkiz-flac-v1.0.6_GH0.tar.gz) = 59e6f3b8fda186b1347e694201b497e9911a0503c1dbd0f05d5365a75b49851d
 SIZE (mewkiz-flac-v1.0.6_GH0.tar.gz) = 5955043
-SHA256 (mewkiz-pkg-f6b5e26764c3_GH0.tar.gz) = ea1b270c16f24583bf48cae50de8e70359b96d4dc82d45cbb6bbb5a8b20ec369
-SIZE (mewkiz-pkg-f6b5e26764c3_GH0.tar.gz) = 19918
+SHA256 (mewkiz-pkg-dd47075182ea_GH0.tar.gz) = 5355622eb7c73ffea31a0714a4bf431cfea1821f28b0c71a945b8fdc6c734882
+SIZE (mewkiz-pkg-dd47075182ea_GH0.tar.gz) = 20573
 SHA256 (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 0e04d8fe1065459ab234507b9a4b7164b05eda970fee6ffdf0219423c357fda8
 SIZE (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 8903
 SHA256 (mitchellh-reflectwalk-v1.0.1_GH0.tar.gz) = c81ed165d0250541655304973d5379a61e00ef074c471b6a6be2c38b204a2afd
 SIZE (mitchellh-reflectwalk-v1.0.1_GH0.tar.gz) = 6449
+SHA256 (mmcdole-gofeed-v1.1.0_GH0.tar.gz) = 3c3a88535b9ffb8821664cc31a822b327ea82ca199f1fc08839c76d9382132f5
+SIZE (mmcdole-gofeed-v1.1.0_GH0.tar.gz) = 119552
+SHA256 (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 432aadb22bc36d15d405c8b08a2c44dfd6f73508c49971e5a773cb6683f124ab
+SIZE (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 5167
+SHA256 (modern-go-concurrent-e0a39a4cb421_GH0.tar.gz) = 19137c93c8d4bf8c3920716cca3b0f0112707604706cfa86fc61794594151b44
+SIZE (modern-go-concurrent-e0a39a4cb421_GH0.tar.gz) = 5482
+SHA256 (modern-go-reflect2-4b7aa43c6742_GH0.tar.gz) = 7b73f745b51d16ce83a598d03cbd9e8c03e52d66f46927cdc6a500453d171c1e
+SIZE (modern-go-reflect2-4b7aa43c6742_GH0.tar.gz) = 14312
 SHA256 (nicksellen-audiotags-94015fa599bd_GH0.tar.gz) = 7577ef460c7c7dfdac1a5f80a74945b1a70343584b714c35b21affcb45c1988b
 SIZE (nicksellen-audiotags-94015fa599bd_GH0.tar.gz) = 12235
 SHA256 (oklog-run-v1.1.0_GH0.tar.gz) = 00c8e2d2071fca7db49027aaaf1e846fa863c4d8a5be33b49898d828ba88cdb5
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	hydrogen
-DISTVERSION=	1.0.0
-PORTREVISION=	1
+DISTVERSION=	1.0.1
 CATEGORIES=	audio

 MAINTAINER=	FreeBSD@ShaneWare.Biz
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1597478300
-SHA256 (hydrogen-music-hydrogen-1.0.0_GH0.tar.gz) = c4eac296a0d20578c274faf7816cf35c16ed43b634d91d2d19686bf9bbfeb970
-SIZE (hydrogen-music-hydrogen-1.0.0_GH0.tar.gz) = 11501728
+TIMESTAMP = 1608443952
+SHA256 (hydrogen-music-hydrogen-1.0.1_GH0.tar.gz) = de6e8ba259ff340037f24e80f8b34592138603b080b02cfa3214ef9b0d66ac63
+SIZE (hydrogen-music-hydrogen-1.0.1_GH0.tar.gz) = 11501583
--- a/audio/hydrogen/files/patch-data_i18n_CMakeLists.txt
+++ b/audio/hydrogen/files/patch-data_i18n_CMakeLists.txt
@ -1,8 +1,11 @@
--- data/i18n/CMakeLists.txt.orig	2020-08-15 20:14:40 UTC
-+++ data/i18n/CMakeLists.txt
-@@ -5,4 +5,4 @@ FILE(GLOB TS_FILES ${CMAKE_CURRENT_LIST_DIR}/*.ts)
- 
- QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
+--- data/i18n/CMakeLists.txt.orig	2020-12-20 08:51:14.629324000 -0800
+++ data/i18n/CMakeLists.txt	2020-12-20 08:51:25.442169000 -0800
+@@ -7,7 +7,7 @@
 ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
-INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+INSTALL(FILES ${QM_FILES} DESTINATION "%%DATADIR%%/data/i18n")
+ 
+ IF(MINGW)
+-	INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
+	INSTALL(FILES ${QM_FILES} DESTINATION "%%DATADIR%%/data/i18n")
+ ELSE()
+ 	INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
+ ENDIF()
--- a/audio/hydrogen/files/patch-src_gui_src_SoundLibrary_SoundLibraryExportDialog.cpp
+++ b/audio/hydrogen/files/patch-src_gui_src_SoundLibrary_SoundLibraryExportDialog.cpp
@ -1,19 +0,0 @@
--- src/gui/src/SoundLibrary/SoundLibraryExportDialog.cpp.orig	2020-08-03 19:45:59 UTC
-+++ src/gui/src/SoundLibrary/SoundLibraryExportDialog.cpp
-@@ -90,6 +90,7 @@ void SoundLibraryExportDialog::on_exportBtn_clicked()
- 	Drumkit*	pDrumkit = nullptr;
- 	
- 	QDir qdTempFolder( Filesystem::tmp_dir() );
-+	bool TmpFileCreated = false;
- 
- 	int componentID = -1;
- 	
-@@ -100,6 +101,8 @@ void SoundLibraryExportDialog::on_exportBtn_clicked()
- 				QString temporaryDrumkitXML = qdTempFolder.filePath( "drumkit.xml" );
- 				INFOLOG( "[ExportSoundLibrary]" );
- 				INFOLOG( "Saving temporary file into: " + temporaryDrumkitXML );
-+				
-+				TmpFileCreated = true;
- 				
- 				for (std::vector<DrumkitComponent*>::iterator it = pDrumkit->get_components()->begin() ; it != pDrumkit->get_components()->end(); ++it) {
- 					DrumkitComponent* pComponent = *it;
--- a/audio/hydrogen/pkg-plist
+++ b/audio/hydrogen/pkg-plist
@ -66,7 +66,7 @@ include/hydrogen/synth/Synth.h
 include/hydrogen/timehelper.h
 include/hydrogen/timeline.h
 include/hydrogen/version.h
-lib/libhydrogen-core-1.0.0.so
+lib/libhydrogen-core-1.0.1.so
 man/man1/hydrogen.1.gz
 share/appdata/org.hydrogenmusic.Hydrogen.appdata.xml
 share/applications/org.hydrogenmusic.Hydrogen.desktop
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@ -3,16 +3,14 @@

 PORTNAME=	musescore
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5
-PORTREVISION=	2
+DISTVERSION=	3.6.1
 CATEGORIES=	audio
-# DISTNAME=	MuseScore-${DISTVERSION}

 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Free music composition & notation software

 LICENSE=	GPLv2
-# LICENSE_FILE=	LICENSE.GPL
+LICENSE_FILE=	${WRKSRC}/LICENSE.GPL

 LIB_DEPENDS=	libmp3lame.so:audio/lame \
 		libsndfile.so:audio/libsndfile \
@ -36,15 +34,13 @@ GH_PROJECT=	MuseScore
 # so hope that scanning the parent dir finds new ones.
 #
 # Note needs PORTVERSION:R once there is a .minor version
-DATADIR=	${PREFIX}/share/mscore-${PORTVERSION}
+DATADIR=	${PREFIX}/share/mscore-${PORTVERSION:R}

 ALL_TARGET=	lrelease manpages all
-CMAKE_ARGS+=	-DUSE_SYSTEM_FREETYPE="ON" \
-		-DBUILD_PORTMIDI=OFF \
-		-DBUILD_PCH=OFF \
-		-DDOWNLOAD_SOUNDFONT=OFF
-# Musescore upcases the build type anyway
-CMAKE_BUILD_TYPE=	RELEASE
+
+CMAKE_OFF=	BUILD_PORTMIDI BUILD_PCH MSCORE_UNSTABLE
+CMAKE_ON=	USE_SYSTEM_FREETYPE
+CMAKE_BUILD_TYPE=	release

 # WebEngine is only available on i386/amd64, amd ppc64 starting FreeBSD 13.0.
 # If enabled on arches that don't have WebEngine, the build breaks.
@ -72,20 +68,4 @@ WEBENGINE_CMAKE_BOOL=	BUILD_WEBENGINE
 CXXFLAGS+=	-Wno-inconsistent-missing-override
 .endif

-post-extract:
-	@${RM} -r ${WRKSRC}/thirdparty/freetype
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "CMakeLists.txt" -print0 | ${XARGS} -0 \
-		${REINPLACE_CMD} -e \
-		'/RELEASE/s|-O2 ||; \
-		 /COMPILE_FLAGS/s|-g ||; \
-		 s|share/man|man|; \
-		 /COMPILE_FLAGS/s|$${PCH_INCLUDE} |-include $${PROJECT_BINARY_DIR}/all.h |'
-	@${REINPLACE_CMD} -e \
-		's|<errno.h>|<cerrno>| ; \
-		 s|<limits.h>|<climits>| ; \
-		 s|<math.h>|<cmath>| ; \
-		 s|<stdio.h>|<cstdio>|' ${WRKSRC}/all.h
-
 .include <bsd.port.post.mk>
--- a/audio/musescore/distinfo
+++ b/audio/musescore/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1597343145
-SHA256 (musescore-MuseScore-v3.5_GH0.tar.gz) = 6456ab92298a19b08dddc478d2d7f7847c1bbe104a13963efa6d24b752bb30a7
-SIZE (musescore-MuseScore-v3.5_GH0.tar.gz) = 66798006
+TIMESTAMP = 1612100912
+SHA256 (musescore-MuseScore-v3.6.1_GH0.tar.gz) = ca0e71995aeef50f65e52ef93e1663b91d3cbbbd68086ff949fe121da8e3081d
+SIZE (musescore-MuseScore-v3.6.1_GH0.tar.gz) = 68754499
--- a/audio/musescore/files/patch-CMakeLists.txt
+++ b/audio/musescore/files/patch-CMakeLists.txt
@ -3,9 +3,75 @@ loops in Ninja. I don't see much value in the PCH here, so
 just zero them out. (Neither do I understand how ninja ends
 up with the dependency loop; make handles this without complaint)

--- CMakeLists.txt.orig	2020-01-25 12:18:16 UTC
+--- CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
 +++ CMakeLists.txt
-@@ -750,8 +750,8 @@ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
+@@ -276,7 +276,7 @@ endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
+ 
+ if (NOT MSVC)
+    set(CMAKE_CXX_FLAGS_DEBUG   "-g")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
+   set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
+ endif (NOT MSVC)
+ 
+ if (APPLE)
+@@ -629,6 +629,38 @@ else(APPLE)
+       set_target_properties(oggdll PROPERTIES IMPORTED_IMPLIB ${OGG_LIBRARY})
+    else (MINGW OR MSVC)
+       set(SNDFILE_LIB sndfile)
+      message(STATUS "Looking for support libraries")
+      PKGCONFIG1(sndfile 1.0 SNDFILE_INCDIR SNDFILE_LIBDIR SNDFILE_LIB SNDFILE_CPP)
+      PKGCONFIG1(ogg 1.0 OGG_INCDIR OGG_LIBDIR OGG_LIB OGG_CPP)
+      PKGCONFIG1(vorbis 1.0 VORBIS_INCDIR VORBIS_LIBDIR VORBIS_LIB VORBIS_CPP)
+      message(STATUS "sndfile=${SNDFILE_LIBDIR} ogg=${OGG_LIBDIR} vorbis=${VORBIS_LIBDIR}")
+      if (SNDFILE_LIB)
+        find_library(_l sndfile PATHS ${SNDFILE_LIBDIR})
+        if (_l)
+          add_library(sndfile UNKNOWN IMPORTED)
+          set_target_properties(sndfile PROPERTIES
+            IMPORTED_LOCATION ${_l}
+            INTERFACE_INCLUDE_DIRECTORIES ${SNDFILE_INCDIR})
+        endif()
+      endif()
+      if (OGG_LIB)
+        find_library(_l ogg PATHS ${OGG_LIBDIR})
+        if (_l)
+          add_library(ogg UNKNOWN IMPORTED)
+          set_target_properties(ogg PROPERTIES
+            IMPORTED_LOCATION ${_l}
+            INTERFACE_INCLUDE_DIRECTORIES ${OGG_INCDIR})
+        endif()
+      endif()
+      if (VORBIS_LIB)
+        find_library(_l vorbis PATHS ${VORBIS_LIBDIR})
+        if (_l)
+          add_library(vorbis UNKNOWN IMPORTED)
+          set_target_properties(vorbis PROPERTIES
+            IMPORTED_LOCATION ${_l}
+            INTERFACE_INCLUDE_DIRECTORIES ${VORBIS_INCDIR})
+        endif()
+      endif()
+    endif (MINGW OR MSVC)
+    set(OGG_LIB ogg)
+ 
+@@ -733,7 +765,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
+             )
+     endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+     # Install man pages in either compressed or uncompressed form
+-    install( FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc)
+    install( FILES ${MAN_BUILD} DESTINATION man/man1 COMPONENT doc)
+     # Create symlink alias for man pages so `man musescore` = `man mscore`
+     find_program( LN_EXECUTABLE ln DOC "A tool for creating symbolic link aliases (optional)." )
+     if (LN_EXECUTABLE)
+@@ -744,7 +776,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
+             COMMAND ${LN_EXECUTABLE} -sf "${MAN_FULL_NAME}" "${MAN_FULL_ALIAS}"
+             COMMAND echo 'Symlink alias: ${MAN_FULL_ALIAS} -> ${MAN_FULL_NAME}'
+             )
+-        install( FILES ${PROJECT_BINARY_DIR}/${MAN_FULL_ALIAS} DESTINATION share/man/man1 COMPONENT doc)
+        install( FILES ${PROJECT_BINARY_DIR}/${MAN_FULL_ALIAS} DESTINATION man/man1 COMPONENT doc)
+      else (LN_EXECUTABLE)
+          message(STATUS "'ln' not found (it is optional). No symlink aliases will be created.")
+      endif (LN_EXECUTABLE)
+@@ -771,8 +803,8 @@ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
 # MSVC does not require these targets, as all.h is not copied and the
 #   PCH generation is done per-project
 if (NOT MSVC)
--- a/audio/musescore/files/patch-aeolus_CMakeLists.txt
+++ b/audio/musescore/files/patch-aeolus_CMakeLists.txt
@ -0,0 +1,18 @@
+--- aeolus/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ aeolus/CMakeLists.txt
+@@ -43,13 +43,13 @@ if (NOT MSVC)
+    set_target_properties (
+       aeolus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties (
+       aeolus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} ${PCH_FORCE_USE}"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h ${PCH_FORCE_USE}"
+       )
+ endif (NOT MSVC)   
+ 
--- a/audio/musescore/files/patch-all.h
+++ b/audio/musescore/files/patch-all.h
@ -0,0 +1,27 @@
+--- all.h.orig	2021-02-06 15:14:17 UTC
+++ all.h
+@@ -34,12 +34,12 @@
+    #define _HAS_AUTO_PTR_ETC 1
+ #endif
+ 
+-#include <stdio.h>
+-#include <limits.h>
+#include <cstdio>
+#include <climits>
+ #include <map>
+ #include <set>
+ #include <deque>
+-#include <errno.h>
+#include <cerrno>
+ #include <fcntl.h>
+ // VStudio does not have <unistd.h>, <io.h> & <process.h> replace many functions from it...
+ #if (defined (_MSCVER) || defined (_MSC_VER))
+@@ -48,7 +48,7 @@
+ #else
+    #include <unistd.h>
+ #endif
+-#include <math.h>
+#include <cmath>
+ #include <array>
+ #include <functional>
+ #include <memory>
--- a/audio/musescore/files/patch-audio_CMakeLists.txt
+++ b/audio/musescore/files/patch-audio_CMakeLists.txt
@ -0,0 +1,11 @@
+--- audio/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ audio/CMakeLists.txt
+@@ -61,7 +61,7 @@ if (NOT MSVC)
+    set_target_properties (
+       ${MODULE}
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties (
--- a/audio/musescore/files/patch-audiofile_CMakeLists.txt
+++ b/audio/musescore/files/patch-audiofile_CMakeLists.txt
@ -0,0 +1,11 @@
+--- audiofile/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ audiofile/CMakeLists.txt
+@@ -40,7 +40,7 @@ if (NOT MSVC)
+    set_target_properties (
+       audiofile
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties (
--- a/audio/musescore/files/patch-avsomr_CMakeLists.txt
+++ b/audio/musescore/files/patch-avsomr_CMakeLists.txt
@ -0,0 +1,11 @@
+--- avsomr/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ avsomr/CMakeLists.txt
+@@ -72,7 +72,7 @@ if (NOT MSVC)
+    set_target_properties (
+       avsomr
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties (
--- a/audio/musescore/files/patch-awl_CMakeLists.txt
+++ b/audio/musescore/files/patch-awl_CMakeLists.txt
@ -0,0 +1,20 @@
+--- awl/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ awl/CMakeLists.txt
+@@ -51,7 +51,7 @@ if (NOT MSVC)
+    set_target_properties (
+       awl
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties (
+@@ -107,7 +107,7 @@ else (NOT MSVC)
+    set_target_properties (
+       awlplugin
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG"
+       )
+ endif (NOT MSVC)   
+ 
--- a/audio/musescore/files/patch-bww2mxml_CMakeLists.txt
+++ b/audio/musescore/files/patch-bww2mxml_CMakeLists.txt
@ -0,0 +1,11 @@
+--- bww2mxml/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ bww2mxml/CMakeLists.txt
+@@ -47,7 +47,7 @@ if (NOT MINGW AND NOT APPLE AND NOT MSVC)
+    set_target_properties (
+          bww2mxml
+          PROPERTIES
+-            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
+            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+          )
+ 
+    target_link_libraries(bww2mxml
--- a/audio/musescore/files/patch-effects_CMakeLists.txt
+++ b/audio/musescore/files/patch-effects_CMakeLists.txt
@ -0,0 +1,11 @@
+--- effects/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ effects/CMakeLists.txt
+@@ -52,7 +52,7 @@ if (NOT MSVC)
+    set_target_properties (
+       effects
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties (
--- a/audio/musescore/files/patch-fonttools_CMakeLists.txt
+++ b/audio/musescore/files/patch-fonttools_CMakeLists.txt
@ -0,0 +1,11 @@
+--- fonttools/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ fonttools/CMakeLists.txt
+@@ -20,7 +20,7 @@ add_executable(
+ target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
+ 
+ if (NOT MSVC)
+-   set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
+   set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -Wall -Wextra -Winvalid-pch")
+ else (NOT MSVC)
+    set_target_properties (
+       genft
--- a/audio/musescore/files/patch-importexport_CMakeLists.txt
+++ b/audio/musescore/files/patch-importexport_CMakeLists.txt
@ -0,0 +1,11 @@
+--- importexport/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ importexport/CMakeLists.txt
+@@ -69,7 +69,7 @@ if (NOT MSVC)
+    set_target_properties (
+       ${MODULE}
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties (
--- a/audio/musescore/files/patch-libmscore_CMakeLists.txt
+++ b/audio/musescore/files/patch-libmscore_CMakeLists.txt
@ -0,0 +1,11 @@
+--- libmscore/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ libmscore/CMakeLists.txt
+@@ -127,7 +127,7 @@ if (NOT MSVC)
+    set_target_properties (
+       libmscore
+       PROPERTIES
+-         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual ${COVERAGE_OPTIONS}"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch -Woverloaded-virtual ${COVERAGE_OPTIONS}"
+       )
+ else (NOT MSVC)
+    set_target_properties (
--- a/audio/musescore/files/patch-main_CMakeLists.txt
+++ b/audio/musescore/files/patch-main_CMakeLists.txt
@ -1,6 +1,22 @@
--- main/CMakeLists.txt.orig	2020-01-27 23:14:49 UTC
+--- main/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
 +++ main/CMakeLists.txt
-@@ -218,7 +218,7 @@ else (MINGW)
+@@ -113,13 +113,13 @@ if (MINGW)
+    if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+      set_target_properties( mscore
+         PROPERTIES
+-           COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+           COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+            LINK_FLAGS "-mwindows -mconsole -L ${QT_INSTALL_LIBS}"
+         )
+    else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+      set_target_properties( mscore
+           PROPERTIES
+-             COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+             COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+              LINK_FLAGS "-Wl,-S -mwindows -L ${QT_INSTALL_LIBS}"
+           )
+    endif(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+@@ -227,7 +227,7 @@ else (MINGW)
 
    if ( NOT MSVC )
       ## install qwebengine core
@ -9,7 +25,7 @@
          install(PROGRAMS
             ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
             DESTINATION bin
-@@ -231,7 +231,7 @@ else (MINGW)
+@@ -240,12 +240,12 @@ else (MINGW)
             ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
             DESTINATION lib/qt5/translations
             )
@ -18,3 +34,26 @@
 
       set_target_properties (
          mscore
+          PROPERTIES
+-            COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
+            COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wno-overloaded-virtual -Winvalid-pch"
+          )
+ 
+       if (APPLE)
+@@ -324,14 +324,14 @@ else (MINGW)
+       if(CMAKE_BUILD_TYPE MATCHES "REL*")
+         set_target_properties( mscore
+            PROPERTIES
+-              COMPILE_FLAGS "${PCH_INCLUDE} ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+              COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+               LINK_FLAGS    "/LIBPATH:${QT_INSTALL_LIBS} ${all_library_paths}"
+               LINK_FLAGS "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup"
+            )
+       else(CMAKE_BUILD_TYPE MATCHES "REL*")
+         set_target_properties( mscore
+            PROPERTIES
+-              COMPILE_FLAGS "${PCH_INCLUDE} ${QT_DEFINITIONS} /DQT_SVG_LIB /DQT_GUI_LIB /DQT_XML_LIB /DQT_CORE_LIB"
+              COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h ${QT_DEFINITIONS} /DQT_SVG_LIB /DQT_GUI_LIB /DQT_XML_LIB /DQT_CORE_LIB"
+               LINK_FLAGS    "/LIBPATH:${QT_INSTALL_LIBS} ${all_library_paths}"
+               LINK_FLAGS "/SUBSYSTEM:CONSOLE"
+            )
--- a/audio/musescore/files/patch-miditools_CMakeLists.txt
+++ b/audio/musescore/files/patch-miditools_CMakeLists.txt
@ -0,0 +1,20 @@
+--- miditools/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ miditools/CMakeLists.txt
+@@ -14,7 +14,7 @@ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midi
+ 
+ if (NOT MSVC)
+    set_target_properties(smf2xml
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
+      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+       )
+ else (NOT MSVC)
+    set_target_properties (smf2xml
+@@ -31,7 +31,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midi
+ if (NOT MSVC)
+    set_target_properties (
+       xml2smf
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
+      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+       )
+ else (NOT MSVC)
+    set_target_properties (
--- a/audio/musescore/files/patch-mscore_CMakeLists.txt
+++ b/audio/musescore/files/patch-mscore_CMakeLists.txt
@ -0,0 +1,70 @@
+--- mscore/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ mscore/CMakeLists.txt
+@@ -147,7 +147,7 @@ if (APPLE)
+       set_target_properties (
+          cocoabridge
+          PROPERTIES
+-         COMPILE_FLAGS "-g -Wall -Wextra -Winvalid-pch  -include ${PROJECT_SOURCE_DIR}/all.h"
+         COMPILE_FLAGS "-Wall -Wextra -Winvalid-pch  -include ${PROJECT_SOURCE_DIR}/all.h"
+          )
+ else (APPLE)
+       set(INCS "")
+@@ -354,13 +354,13 @@ if (MINGW)
+    if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+      set_target_properties( mscoreapp
+         PROPERTIES
+-           COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+           COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+            LINK_FLAGS "-mwindows -mconsole -L ${QT_INSTALL_LIBS}"
+         )
+    else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+      set_target_properties( mscoreapp
+           PROPERTIES
+-             COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+             COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+              LINK_FLAGS "-Wl,-S -mwindows -L ${QT_INSTALL_LIBS}"
+           )
+    endif(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+@@ -394,7 +394,7 @@ else (MINGW)
+          )
+ 
+        if (USE_SYSTEM_FREETYPE)
+-            target_link_libraries(mscoreapp freetype)
+            target_link_libraries(mscoreapp ${FREETYPE_LIBRARIES})
+        else (USE_SYSTEM_FREETYPE)
+             target_link_libraries(mscoreapp mscore_freetype)
+        endif (USE_SYSTEM_FREETYPE)
+@@ -424,7 +424,7 @@ else (MINGW)
+       set_target_properties (
+          mscoreapp
+          PROPERTIES
+-            COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
+            COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wno-overloaded-virtual -Winvalid-pch"
+          )
+ 
+       if (OMR)
+@@ -469,13 +469,13 @@ else (MINGW)
+       if(CMAKE_BUILD_TYPE MATCHES "REL*")
+         set_target_properties( mscoreapp
+            PROPERTIES
+-              COMPILE_FLAGS "${PCH_INCLUDE} ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+              COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+               LINK_FLAGS    "/LIBPATH:${QT_INSTALL_LIBS} ${all_library_paths}"
+            )
+       else(CMAKE_BUILD_TYPE MATCHES "REL*")
+         set_target_properties( mscoreapp
+            PROPERTIES
+-              COMPILE_FLAGS "${PCH_INCLUDE} ${QT_DEFINITIONS} /DQT_SVG_LIB /DQT_GUI_LIB /DQT_XML_LIB /DQT_CORE_LIB"
+              COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h ${QT_DEFINITIONS} /DQT_SVG_LIB /DQT_GUI_LIB /DQT_XML_LIB /DQT_CORE_LIB"
+               LINK_FLAGS    "/LIBPATH:${QT_INSTALL_LIBS} ${all_library_paths}"
+            )
+       endif(CMAKE_BUILD_TYPE MATCHES "REL*")
+@@ -542,7 +542,7 @@ else (NOT MSVC)
+    set_target_properties (
+       inspectorplugin
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SVG_LIB -DQT_SHARED -DQT_NO_DEBUG"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SVG_LIB -DQT_SHARED -DQT_NO_DEBUG"
+       )
+ endif (NOT MSVC)
+ 
--- a/audio/musescore/files/patch-mtest_CMakeLists.txt
+++ b/audio/musescore/files/patch-mtest_CMakeLists.txt
@ -0,0 +1,18 @@
+--- mtest/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ mtest/CMakeLists.txt
+@@ -144,12 +144,12 @@ set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5W
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
+ 
+ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+-      set(TESTUTILS_COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra")
+      set(TESTUTILS_COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra")
+ else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+       if (MSVC)
+-            set(TESTUTILS_COMPILE_FLAGS "${PCH_INCLUDE}  /D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\"")
+            set(TESTUTILS_COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h  /D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\"")
+       else (MSVC)
+-            set(TESTUTILS_COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra")
+            set(TESTUTILS_COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra")
+       endif (MSVC)
+ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ 
--- a/audio/musescore/files/patch-omr_CMakeLists.txt
+++ b/audio/musescore/files/patch-omr_CMakeLists.txt
@ -0,0 +1,11 @@
+--- omr/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ omr/CMakeLists.txt
+@@ -48,7 +48,7 @@ if (NOT MSVC)
+    set_target_properties (
+       omr
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
+       )
+ else (NOT MSVC)
+    set_target_properties (
--- a/audio/musescore/files/patch-thirdparty_beatroot_CMakeLists.txt
+++ b/audio/musescore/files/patch-thirdparty_beatroot_CMakeLists.txt
@ -0,0 +1,17 @@
+--- thirdparty/beatroot/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ thirdparty/beatroot/CMakeLists.txt
+@@ -15,12 +15,12 @@ add_library (
+ if (NOT MSVC)
+    set_target_properties( beatroot
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties ( beatroot
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} /wd4267"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h /wd4267"
+       )
+ endif (NOT MSVC)   
+ 
--- a/audio/musescore/files/patch-thirdparty_ofqf_CMakeLists.txt
+++ b/audio/musescore/files/patch-thirdparty_ofqf_CMakeLists.txt
@ -0,0 +1,11 @@
+--- thirdparty/ofqf/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ thirdparty/ofqf/CMakeLists.txt
+@@ -42,7 +42,7 @@ if (NOT MSVC)
+    set_target_properties (
+       ofqf
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties (
--- a/audio/musescore/files/patch-thirdparty_qt-google-analytics_ganalytics.cpp
+++ b/audio/musescore/files/patch-thirdparty_qt-google-analytics_ganalytics.cpp
@ -1,5 +1,5 @@
--- thirdparty/google_analytics/ganalytics.cpp.orig	2020-10-28 09:58:53 UTC
-+++ thirdparty/google_analytics/ganalytics.cpp
+--- thirdparty/qt-google-analytics/ganalytics.cpp.orig	2021-01-27 17:12:14 UTC
+++ thirdparty/qt-google-analytics/ganalytics.cpp
@@ -381,7 +381,7 @@ QString GAnalytics::Private::getSystemInfo()
             .arg(QAndroidJniObject::getStaticObjectField<jstring>("android/os/Build", "ID").toString())
             .arg(QAndroidJniObject::getStaticObjectField<jstring>("android/os/Build", "BRAND").toString());
--- a/audio/musescore/files/patch-thirdparty_qzip_CMakeLists.txt
+++ b/audio/musescore/files/patch-thirdparty_qzip_CMakeLists.txt
@ -0,0 +1,11 @@
+--- thirdparty/qzip/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ thirdparty/qzip/CMakeLists.txt
+@@ -35,7 +35,7 @@ if (NOT MSVC)
+    set_target_properties (
+       qzip
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties (
--- a/audio/musescore/files/patch-thirdparty_rtf2html_CMakeLists.txt
+++ b/audio/musescore/files/patch-thirdparty_rtf2html_CMakeLists.txt
@ -0,0 +1,17 @@
+--- thirdparty/rtf2html/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ thirdparty/rtf2html/CMakeLists.txt
+@@ -43,12 +43,12 @@ add_library (
+ if (NOT MSVC)
+    set_target_properties( rtf2html
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties ( rtf2html
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} /wd4267"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h /wd4267"
+       )
+ endif (NOT MSVC)   
+ 
--- a/audio/musescore/files/patch-thirdparty_singleapp_src_CMakeLists.txt
+++ b/audio/musescore/files/patch-thirdparty_singleapp_src_CMakeLists.txt
@ -0,0 +1,11 @@
+--- thirdparty/singleapp/src/CMakeLists.txt.orig	2021-01-27 17:12:14 UTC
+++ thirdparty/singleapp/src/CMakeLists.txt
+@@ -37,7 +37,7 @@ if (NOT MSVC)
+    set_target_properties (
+       qtsingleapp
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+         COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+       )
+ else (NOT MSVC)
+    set_target_properties (
--- a/audio/musescore/pkg-plist
+++ b/audio/musescore/pkg-plist
@ -23,24 +23,13 @@ share/icons/hicolor/scalable/mimetypes/application-x-musescore.svg
 share/metainfo/org.musescore.MuseScore.appdata.xml
 share/mime/packages/musescore.xml
 %%DATADIR%%/demos/Brassed_Up.mscx
+%%DATADIR%%/demos/Dawn.mscx
 %%DATADIR%%/demos/Dynamic_Strings.mscx
 %%DATADIR%%/demos/Fugue_1.mscx
 %%DATADIR%%/demos/Reunion.mscz
 %%DATADIR%%/demos/Unclaimed_Gift.mscx
 %%DATADIR%%/instruments/instruments.xml
-%%DATADIR%%/locale/qt_bg.qm
-%%DATADIR%%/locale/qt_el.qm
-%%DATADIR%%/locale/qt_eu.qm
-%%DATADIR%%/locale/qt_gd.qm
-%%DATADIR%%/locale/qt_id.qm
-%%DATADIR%%/locale/qt_lv.qm
-%%DATADIR%%/locale/qt_nb.qm
-%%DATADIR%%/locale/qt_nl.qm
-%%DATADIR%%/locale/qt_nl_BE.qm
-%%DATADIR%%/locale/qt_pt_BR.qm
-%%DATADIR%%/locale/qt_ro.qm
-%%DATADIR%%/locale/qt_tr.qm
-%%DATADIR%%/locale/qt_vi.qm
+%%DATADIR%%/instruments/orders.xml
 %%DATADIR%%/locale/instruments_af.qm
 %%DATADIR%%/locale/instruments_ar.qm
 %%DATADIR%%/locale/instruments_ar_DZ.qm
@ -95,6 +84,7 @@ share/mime/packages/musescore.xml
 %%DATADIR%%/locale/instruments_pt_BR.qm
 %%DATADIR%%/locale/instruments_ro.qm
 %%DATADIR%%/locale/instruments_ru.qm
+%%DATADIR%%/locale/instruments_scn.qm
 %%DATADIR%%/locale/instruments_sk.qm
 %%DATADIR%%/locale/instruments_sl.qm
 %%DATADIR%%/locale/instruments_sr.qm
@ -163,6 +153,7 @@ share/mime/packages/musescore.xml
 %%DATADIR%%/locale/mscore_pt_BR.qm
 %%DATADIR%%/locale/mscore_ro.qm
 %%DATADIR%%/locale/mscore_ru.qm
+%%DATADIR%%/locale/mscore_scn.qm
 %%DATADIR%%/locale/mscore_sk.qm
 %%DATADIR%%/locale/mscore_sl.qm
 %%DATADIR%%/locale/mscore_sr.qm
@ -176,6 +167,19 @@ share/mime/packages/musescore.xml
 %%DATADIR%%/locale/mscore_zh_CN.qm
 %%DATADIR%%/locale/mscore_zh_HK.qm
 %%DATADIR%%/locale/mscore_zh_TW.qm
+%%DATADIR%%/locale/qt_bg.qm
+%%DATADIR%%/locale/qt_el.qm
+%%DATADIR%%/locale/qt_eu.qm
+%%DATADIR%%/locale/qt_gd.qm
+%%DATADIR%%/locale/qt_id.qm
+%%DATADIR%%/locale/qt_lv.qm
+%%DATADIR%%/locale/qt_nb.qm
+%%DATADIR%%/locale/qt_nl.qm
+%%DATADIR%%/locale/qt_nl_BE.qm
+%%DATADIR%%/locale/qt_pt_BR.qm
+%%DATADIR%%/locale/qt_ro.qm
+%%DATADIR%%/locale/qt_tr.qm
+%%DATADIR%%/locale/qt_vi.qm
 %%DATADIR%%/locale/tours_af.qm
 %%DATADIR%%/locale/tours_ar.qm
 %%DATADIR%%/locale/tours_ar_DZ.qm
@ -192,7 +196,6 @@ share/mime/packages/musescore.xml
 %%DATADIR%%/locale/tours_da.qm
 %%DATADIR%%/locale/tours_de.qm
 %%DATADIR%%/locale/tours_el.qm
-%%DATADIR%%/locale/tours_en.qm
 %%DATADIR%%/locale/tours_en_GB.qm
 %%DATADIR%%/locale/tours_en_US.qm
 %%DATADIR%%/locale/tours_eo.qm
@ -231,6 +234,7 @@ share/mime/packages/musescore.xml
 %%DATADIR%%/locale/tours_pt_BR.qm
 %%DATADIR%%/locale/tours_ro.qm
 %%DATADIR%%/locale/tours_ru.qm
+%%DATADIR%%/locale/tours_scn.qm
 %%DATADIR%%/locale/tours_sk.qm
 %%DATADIR%%/locale/tours_sl.qm
 %%DATADIR%%/locale/tours_sr.qm
@ -250,8 +254,8 @@ share/mime/packages/musescore.xml
 %%DATADIR%%/plugins/helloqml/helloqml.qml
 %%DATADIR%%/plugins/helloqml/translations/locale_de.qm
 %%DATADIR%%/plugins/helloqml/translations/locale_de.ts
-%%DATADIR%%/plugins/notenames.qml
 %%DATADIR%%/plugins/notenames-interactive.qml
+%%DATADIR%%/plugins/notenames.qml
 %%DATADIR%%/plugins/panel.qml
 %%DATADIR%%/plugins/random.qml
 %%DATADIR%%/plugins/random2.qml
@ -259,8 +263,9 @@ share/mime/packages/musescore.xml
 %%DATADIR%%/plugins/scorelist.qml
 %%DATADIR%%/plugins/view.qml
 %%DATADIR%%/plugins/walk.qml
-%%DATADIR%%/sound/MuseScore_General_License.md
 %%DATADIR%%/sound/MuseScore_General.sf3
+%%DATADIR%%/sound/MuseScore_General_License.md
+%%DATADIR%%/styles/Leland.mss
 %%DATADIR%%/styles/MuseJazz.mss
 %%DATADIR%%/styles/cchords_muse.xml
 %%DATADIR%%/styles/cchords_nrb.xml
@ -270,6 +275,9 @@ share/mime/packages/musescore.xml
 %%DATADIR%%/styles/chords_jazz.xml
 %%DATADIR%%/styles/chords_std.xml
 %%DATADIR%%/styles/jazzchords.xml
+%%DATADIR%%/styles/legacy-style-defaults-v1.mss
+%%DATADIR%%/styles/legacy-style-defaults-v2.mss
+%%DATADIR%%/styles/legacy-style-defaults-v3.mss
 %%DATADIR%%/styles/stdchords.xml
 %%DATADIR%%/templates/01-General/00-Blank.mscx
 %%DATADIR%%/templates/01-General/01-Treble_Clef.mscx
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	musicpd
 PORTVERSION=	0.22.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
@ -12,19 +13,15 @@ COMMENT=	Remote-controllable music daemon
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

-BUILD_DEPENDS=	${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
 LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
 		libicudata.so:devel/icu

 USES=		compiler:c++17-lang localbase:ldflags meson pkgconfig \
 		python:build tar:xz

-USE_GNOME=	glib20
-
 USE_RC_SUBR=	${PORTNAME}
 MESON_ARGS=	-Dauto_features=disabled \
 		-Dbzip2=enabled \
-		-Ddocumentation=enabled \
 		-Dhttpd=true \
 		-Dicu=enabled \
 		-Doss=enabled \
@ -36,7 +33,9 @@ PORTDOCS=	AUTHORS README.md NEWS

 SUB_FILES=	pkg-message

-OPTIONS_DEFINE=	DOCS ID3TAG IPV6 ISO9660 SQLITE3 \
+OPTIONS_SUB=	yes
+
+OPTIONS_DEFINE=	DOCS ID3TAG IPV6 ISO9660 MANPAGES SQLITE3 \
 		PROXYDB VORBISENC ZZIP

 OPTIONS_RADIO=	RESAMPLER ZEROCONF
@ -78,9 +77,12 @@ WILDMIDI_DESC=	WildMIDI support (MIDI files)
 YAJL_DESC=	JSON support via libyajl
 ZZIP_DESC=	Support for zzip archives

-OPTIONS_DEFAULT=CURL FFMPEG FLAC ID3TAG LAME OPUS \
+OPTIONS_DEFAULT=CURL FFMPEG FLAC ID3TAG LAME MANPAGES OPUS \
 		PLAYLISTS PROXYDB SNDFILE VORBIS VORBISENC

+MANPAGES_MESON_ENABLED=	documentation
+MANPAGES_BUILD_DEPENDS=	${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
+
 # Decoder plugins
 ADPLUG_MESON_ENABLED=	adplug
 ADPLUG_LIB_DEPENDS=	libadplug.so:audio/libadplug
@ -196,7 +198,7 @@ SOUNDCLOUD_IMPLIES=	CURL YAJL
 TIDAL_MESON_ENABLED=	tidal
 TIDAL_IMPLIES=		CURL YAJL

-# Misc library suppore
+# Misc library support
 AVAHI_MESON_ON=		-Dzeroconf=avahi
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 MDNSRESPONDER_MESON_ON=		-Dzeroconf=bonjour
@ -259,10 +261,12 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/_build/mpd \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+.if ${PORT_OPTIONS:MMANPAGES}
 	${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.1 \
 		${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.conf.5 \
 		${STAGEDIR}${PREFIX}/man/man5
+.endif
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \
--- a/audio/musicpd/pkg-plist
+++ b/audio/musicpd/pkg-plist
@ -1,4 +1,4 @@
 bin/musicpd
@sample etc/musicpd.conf.sample
-man/man1/musicpd.1.gz
-man/man5/musicpd.conf.5.gz
+%%MANPAGES%%man/man1/musicpd.1.gz
+%%MANPAGES%%man/man5/musicpd.conf.5.gz
--- a/audio/pulseeffects/Makefile
+++ b/audio/pulseeffects/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	pulseeffects
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.6.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio

 MAINTAINER=	daniel@shafer.cc
@ -44,7 +44,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
 USES=		compiler:c++17-lang desktop-file-utils libtool \
 		localbase:ldflags gettext gnome meson ninja pathfix pkgconfig \
 		python:3.6+ shebangfix
-USE_GNOME=	cairo gconf2 gtkmm30 libsigc++20 pygobject3
+USE_GNOME=	cairo gtkmm30 libsigc++20 pygobject3
 USE_GSTREAMER1=	bad bs2b good ladspa lv2 pulse webrtcdsp
 USE_LDCONFIG=	yes

--- a/audio/py-python-mpd2/Makefile
+++ b/audio/py-python-mpd2/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	python-mpd2
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 CATEGORIES=	audio python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/audio/py-python-mpd2/distinfo
+++ b/audio/py-python-mpd2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1611856536
-SHA256 (python-mpd2-3.0.3.tar.gz) = 5693deb8350d35e26ab8d0bcd7ab180892f1b086d0cc759996cb32b3b1b07bc6
-SIZE (python-mpd2-3.0.3.tar.gz) = 57010
+TIMESTAMP = 1612519121
+SHA256 (python-mpd2-3.0.4.tar.gz) = 7a67834e22d97e7cd77f8951c8baf87c149285c67d67d73550ce034302561ae5
+SIZE (python-mpd2-3.0.4.tar.gz) = 57445
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@ -3,9 +3,12 @@

 PORTNAME=	qjackctl
 DISTVERSIONPREFIX=	qjackctl_
-DISTVERSION=	0_9_0
+DISTVERSION=	0_9_1
 CATEGORIES=	audio

+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	275c36a3cbad51d337f7afc5d420efc80ab19d70.patch:-p1
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Qt interface for JACK Audio Connection Kit

@ -16,12 +19,13 @@ LIB_DEPENDS=	libjack.so:audio/jack

 USES=		autoreconf compiler:c++11-lib gl gmake localbase pkgconfig qt:5
 GNU_CONFIGURE=	yes
-USE_GITHUB=	yes
-GH_ACCOUNT=	rncbc
 USE_QT=		core gui network widgets x11extras xml buildtools_build linguisttools_build qmake_build
 USE_GL=		gl
 USE_CXXSTD=	c++11

+USE_GITHUB=	yes
+GH_ACCOUNT=	rncbc
+
 BINARY_ALIAS=	qmake=${QMAKE}

 OPTIONS_DEFINE=		DBUS SYSTRAY XUNIQUE
--- a/audio/qjackctl/distinfo
+++ b/audio/qjackctl/distinfo
@ -1,3 +1,5 @@
-TIMESTAMP = 1608426545
-SHA256 (rncbc-qjackctl-qjackctl_0_9_0_GH0.tar.gz) = 869f763891962261efe4aa292ec8a8202fa8f5ebd3d50d45f6265daeb462835a
-SIZE (rncbc-qjackctl-qjackctl_0_9_0_GH0.tar.gz) = 1020016
+TIMESTAMP = 1612734569
+SHA256 (rncbc-qjackctl-qjackctl_0_9_1_GH0.tar.gz) = 365842b04c8b79a3295b7573a282e4ab2d1bc9833573ac10c777c8e397b648b9
+SIZE (rncbc-qjackctl-qjackctl_0_9_1_GH0.tar.gz) = 1024220
+SHA256 (275c36a3cbad51d337f7afc5d420efc80ab19d70.patch) = 6ebcda2e62533b0f92e431c7082f29d615e8d1e1e5357ea91170b37363619247
+SIZE (275c36a3cbad51d337f7afc5d420efc80ab19d70.patch) = 632
--- a/audio/qjackctl/files/patch-src_qjackctl.cpp
+++ b/audio/qjackctl/files/patch-src_qjackctl.cpp
@ -1,11 +0,0 @@
--- src/qjackctl.cpp.orig	2019-07-12 10:07:12 UTC
-+++ src/qjackctl.cpp
-@@ -190,7 +190,7 @@ bool qjackctlApplication::setup ( const QString& sServ
- 			sUnique += sServerName;
- 		}
- 		char szHostName[255];
-		if (::gethostname(szHostName, sizeof(szHostName)) == 0) {
-+		if (gethostname(szHostName, sizeof(szHostName)) == 0) {
- 			sUnique += '@';
- 			sUnique += szHostName;
- 		}
--- a/audio/qjackctl/files/patch-src_qjackctlSetup.cpp
+++ b/audio/qjackctl/files/patch-src_qjackctlSetup.cpp
@ -1,11 +0,0 @@
--- src/qjackctlSetup.cpp.orig	2016-04-05 15:57:30 UTC
-+++ src/qjackctlSetup.cpp
-@@ -34,7 +34,7 @@
- #if defined(WIN32)
- #define DEFAULT_DRIVER "portaudio"
- #else
-#define DEFAULT_DRIVER "alsa"
-+#define DEFAULT_DRIVER "oss"
- #endif
- 
- 
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@ -2,8 +2,8 @@
 # $FreeBSD$

 PORTNAME=	rhythmbox
-PORTVERSION=	3.4.2
-PORTREVISION=	8
+PORTVERSION=	3.4.4
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@ -22,12 +22,12 @@ LIB_DEPENDS=	libmusicbrainz5.so:audio/libmusicbrainz5 \
 		libtotem-plparser.so:multimedia/totem-pl-parser \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
-		libhal.so:sysutils/hal \
 		libsoup-2.4.so:devel/libsoup \
 		libcheck.so:devel/check \
 		libpeas-1.0.so:devel/libpeas \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsecret-1.so:security/libsecret \
+		libgudev-1.0.so:devel/libgudev \
 		libtdb.so:databases/tdb

 USES=		desktop-file-utils gmake gnome libtool localbase \
@ -40,7 +40,6 @@ USE_GSTREAMER1=	flac lame jpeg cdparanoia vorbis
 CONFIGURE_ARGS=	--enable-vala \
 		--enable-visualizer=no \
 		--with-python=yes \
-		--disable-browser-plugin \
 		--with-libsecret=yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
@ -70,8 +69,7 @@ IPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod \
 LIRC_CONFIGURE_ENABLE=	lirc
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 MTP_CONFIGURE_WITH=	mtp
-MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp \
-			libhal.so:sysutils/hal
+MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 NOTIFY_CONFIGURE_ENABLE=	libnotify
@ -80,12 +78,4 @@ PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_USES=		python:3.3+
 PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}

-post-patch:
-	@${REINPLACE_CMD} -e 's|{MOZILLA_PLUGINDIR|{MOZILLA_PLUGINDIR}|g' \
-		${WRKSRC}/configure
-
-# rbzeitgeist plugin needs py3-zeitgeist
-post-install:
-	@${RM} -r ${STAGEDIR}${PREFIX}/lib/rhythmbox/plugins/rbzeitgeist
-
 .include <bsd.port.mk>
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1509240983
-SHA256 (gnome3/rhythmbox-3.4.2.tar.xz) = c27622fb7658d3c8e935937a562ebd8a65f5316a12694d6a06cb17f790b6ec43
-SIZE (gnome3/rhythmbox-3.4.2.tar.xz) = 6909436
+TIMESTAMP = 1612673232
+SHA256 (gnome3/rhythmbox-3.4.4.tar.xz) = ee0eb0d7d7bdf696ac9471b19ff3bea3240d63b6cb8a134bf632054af8665d90
+SIZE (gnome3/rhythmbox-3.4.4.tar.xz) = 3890320
--- a/audio/rhythmbox/files/patch-configure
+++ b/audio/rhythmbox/files/patch-configure
@ -1,11 +0,0 @@
--- configure.orig	2015-04-19 09:36:39 UTC
-+++ configure
-@@ -21798,7 +21798,7 @@ else
- fi
- 
- 
-MOZILLA_PLUGINDIR=${MOZILLA_PLUGINDIR:-'${libdir}/mozilla/plugins'}
-+MOZILLA_PLUGINDIR=${MOZILLA_PLUGINDIR}
- 
- 
-  if test x$enable_browser_plugin = xyes; then
--- a/audio/rhythmbox/files/patch-gst114
+++ b/audio/rhythmbox/files/patch-gst114
@ -1,12 +0,0 @@
-Obtained from: https://gitlab.gnome.org/GNOME/rhythmbox/commit/b182c6b9e1d09e601bac0b703cc5f8b159ebbc3a
--- plugins/fmradio/rb-fm-radio-gst-src.c.orig
-+++ plugins/fmradio/rb-fm-radio-gst-src.c
-@@ -178,7 +178,7 @@ plugin_init (GstPlugin *plugin)
-
- GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-		   GST_VERSION_MINOR,
-		   "rbsilencesrc",
-+		   rbsilencesrc,
-		   "element to output silence",
-		   plugin_init,
-		   VERSION,
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@ -58,6 +58,7 @@ include/rhythmbox/sources/rb-source.h
 include/rhythmbox/sources/rb-static-playlist-source.h
 include/rhythmbox/sources/rb-streaming-source.h
 include/rhythmbox/sources/rb-transfer-target.h
+include/rhythmbox/widgets/nautilus-floating-bar.h
 include/rhythmbox/widgets/rb-alert-dialog.h
 include/rhythmbox/widgets/rb-button-bar.h
 include/rhythmbox/widgets/rb-cell-renderer-pixbuf.h
@ -245,10 +246,6 @@ lib/rhythmbox/plugins/power-manager/power-manager.plugin
 %%PYTHON%%lib/rhythmbox/plugins/replaygain/player.py
 %%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain.plugin
 %%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain.py
-%%PYTHON%%lib/rhythmbox/plugins/sendto/__pycache__/sendto.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/sendto/__pycache__/sendto.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/sendto/sendto.plugin
-%%PYTHON%%lib/rhythmbox/plugins/sendto/sendto.py
 %%PYTHON%%lib/rhythmbox/plugins/soundcloud/__pycache__/soundcloud.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON%%lib/rhythmbox/plugins/soundcloud/__pycache__/soundcloud.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%lib/rhythmbox/plugins/soundcloud/soundcloud.plugin
@ -264,6 +261,23 @@ lib/rhythmbox/plugins/power-manager/power-manager.plugin
 %%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/__pycache__/sample-python.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/sample-python.plugin
 %%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/sample-python.py
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/client.cpython-%%PYTHON_SUFFIX.opt-1.pyc
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/client.cpython-%%PYTHON_SUFFIX.pyc
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/listenbrainz.cpython-%%PYTHON_SUFFIX.opt-1.pyc
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/listenbrainz.cpython-%%PYTHON_SUFFIX.pyc
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/queue.cpython-%%PYTHON_SUFFIX.opt-1.pyc
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/queue.cpython-%%PYTHON_SUFFIX.pyc
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/settings.cpython-%%PYTHON_SUFFIX.opt-1.pyc
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/settings.cpython-%%PYTHON_SUFFIX.pyc
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/client.py
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/listenbrainz.plugin
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/listenbrainz.py
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/queue.py
+%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/settings.py
+%%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/__pycache__/rbzeitgeist.cpython-%%PYTHON_SUFFIX.opt-1.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/__pycache__/rbzeitgeist.cpython-%%PYTHON_SUFFIX.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/rbzeitgeist.plugin
+%%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/rbzeitgeist.py
 lib/rhythmbox/sample-plugins/sample-vala/libsample-vala.so
 lib/rhythmbox/sample-plugins/sample-vala/sample-vala.plugin
 lib/rhythmbox/sample-plugins/sample/libsample.so
@ -272,7 +286,6 @@ libdata/pkgconfig/rhythmbox.pc
 libexec/rhythmbox-metadata
 man/man1/rhythmbox-client.1.gz
 man/man1/rhythmbox.1.gz
-share/appdata/rhythmbox.appdata.xml
 share/applications/rhythmbox-device.desktop
 share/applications/rhythmbox.desktop
 share/dbus-1/services/org.gnome.Rhythmbox3.service
@ -314,7 +327,6 @@ share/dbus-1/services/org.gnome.Rhythmbox3.service
 %%PORTDOCS%%%%DOCSDIR%%/RBSongInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/RBSource.html
 %%PORTDOCS%%%%DOCSDIR%%/RBStaticPlaylistSource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBStatusbar.html
 %%PORTDOCS%%%%DOCSDIR%%/RBStreamingSource.html
 %%PORTDOCS%%%%DOCSDIR%%/RBStringValueMap.html
 %%PORTDOCS%%%%DOCSDIR%%/RBTrackTransferBatch.html
@ -360,349 +372,218 @@ share/dbus-1/services/org.gnome.Rhythmbox3.service
 %%PORTDOCS%%%%DOCSDIR%%/up.png
 share/gir-1.0/MPID-3.0.gir
 share/gir-1.0/RB-3.0.gir
-share/help/C/rhythmbox/fdl-appendix.xml
 share/help/C/rhythmbox/figures/rb-iradio-main.png
-share/help/C/rhythmbox/figures/rb-notification-area-menu.png
-share/help/C/rhythmbox/figures/rb-notification-window.png
 share/help/C/rhythmbox/figures/rb-notification-zone.png
 share/help/C/rhythmbox/figures/rb-podcast-main.png
-share/help/C/rhythmbox/figures/rb-statusbar.png
 share/help/C/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/C/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/C/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/C/rhythmbox/figures/rb-toolbar.png
 share/help/C/rhythmbox/figures/rb-volume-changer.png
-share/help/C/rhythmbox/figures/rb-window-small.png
 share/help/C/rhythmbox/figures/rb-window.png
 share/help/C/rhythmbox/index.docbook
 share/help/C/rhythmbox/legal.xml
-share/help/ca/rhythmbox/fdl-appendix.xml
 share/help/ca/rhythmbox/figures/rb-iradio-main.png
-share/help/ca/rhythmbox/figures/rb-notification-area-menu.png
-share/help/ca/rhythmbox/figures/rb-notification-window.png
 share/help/ca/rhythmbox/figures/rb-notification-zone.png
 share/help/ca/rhythmbox/figures/rb-podcast-main.png
-share/help/ca/rhythmbox/figures/rb-statusbar.png
 share/help/ca/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/ca/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/ca/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/ca/rhythmbox/figures/rb-toolbar.png
 share/help/ca/rhythmbox/figures/rb-volume-changer.png
-share/help/ca/rhythmbox/figures/rb-window-small.png
 share/help/ca/rhythmbox/figures/rb-window.png
 share/help/ca/rhythmbox/index.docbook
 share/help/ca/rhythmbox/legal.xml
-share/help/cs/rhythmbox/fdl-appendix.xml
 share/help/cs/rhythmbox/figures/rb-iradio-main.png
-share/help/cs/rhythmbox/figures/rb-notification-area-menu.png
-share/help/cs/rhythmbox/figures/rb-notification-window.png
 share/help/cs/rhythmbox/figures/rb-notification-zone.png
 share/help/cs/rhythmbox/figures/rb-podcast-main.png
-share/help/cs/rhythmbox/figures/rb-statusbar.png
 share/help/cs/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/cs/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/cs/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/cs/rhythmbox/figures/rb-toolbar.png
 share/help/cs/rhythmbox/figures/rb-volume-changer.png
-share/help/cs/rhythmbox/figures/rb-window-small.png
 share/help/cs/rhythmbox/figures/rb-window.png
 share/help/cs/rhythmbox/index.docbook
 share/help/cs/rhythmbox/legal.xml
-share/help/da/rhythmbox/fdl-appendix.xml
 share/help/da/rhythmbox/figures/rb-iradio-main.png
-share/help/da/rhythmbox/figures/rb-notification-area-menu.png
-share/help/da/rhythmbox/figures/rb-notification-window.png
 share/help/da/rhythmbox/figures/rb-notification-zone.png
 share/help/da/rhythmbox/figures/rb-podcast-main.png
-share/help/da/rhythmbox/figures/rb-statusbar.png
 share/help/da/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/da/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/da/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/da/rhythmbox/figures/rb-toolbar.png
 share/help/da/rhythmbox/figures/rb-volume-changer.png
-share/help/da/rhythmbox/figures/rb-window-small.png
 share/help/da/rhythmbox/figures/rb-window.png
 share/help/da/rhythmbox/index.docbook
 share/help/da/rhythmbox/legal.xml
-share/help/de/rhythmbox/fdl-appendix.xml
 share/help/de/rhythmbox/figures/rb-iradio-main.png
-share/help/de/rhythmbox/figures/rb-notification-area-menu.png
-share/help/de/rhythmbox/figures/rb-notification-window.png
 share/help/de/rhythmbox/figures/rb-notification-zone.png
 share/help/de/rhythmbox/figures/rb-podcast-main.png
-share/help/de/rhythmbox/figures/rb-statusbar.png
 share/help/de/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/de/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/de/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/de/rhythmbox/figures/rb-toolbar.png
 share/help/de/rhythmbox/figures/rb-volume-changer.png
-share/help/de/rhythmbox/figures/rb-window-small.png
 share/help/de/rhythmbox/figures/rb-window.png
 share/help/de/rhythmbox/index.docbook
 share/help/de/rhythmbox/legal.xml
-share/help/el/rhythmbox/fdl-appendix.xml
 share/help/el/rhythmbox/figures/rb-iradio-main.png
-share/help/el/rhythmbox/figures/rb-notification-area-menu.png
-share/help/el/rhythmbox/figures/rb-notification-window.png
 share/help/el/rhythmbox/figures/rb-notification-zone.png
 share/help/el/rhythmbox/figures/rb-podcast-main.png
-share/help/el/rhythmbox/figures/rb-statusbar.png
 share/help/el/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/el/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/el/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/el/rhythmbox/figures/rb-toolbar.png
 share/help/el/rhythmbox/figures/rb-volume-changer.png
-share/help/el/rhythmbox/figures/rb-window-small.png
 share/help/el/rhythmbox/figures/rb-window.png
 share/help/el/rhythmbox/index.docbook
 share/help/el/rhythmbox/legal.xml
-share/help/es/rhythmbox/fdl-appendix.xml
 share/help/es/rhythmbox/figures/rb-iradio-main.png
-share/help/es/rhythmbox/figures/rb-notification-area-menu.png
-share/help/es/rhythmbox/figures/rb-notification-window.png
 share/help/es/rhythmbox/figures/rb-notification-zone.png
 share/help/es/rhythmbox/figures/rb-podcast-main.png
-share/help/es/rhythmbox/figures/rb-statusbar.png
 share/help/es/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/es/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/es/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/es/rhythmbox/figures/rb-toolbar.png
 share/help/es/rhythmbox/figures/rb-volume-changer.png
-share/help/es/rhythmbox/figures/rb-window-small.png
 share/help/es/rhythmbox/figures/rb-window.png
 share/help/es/rhythmbox/index.docbook
 share/help/es/rhythmbox/legal.xml
-share/help/eu/rhythmbox/fdl-appendix.xml
 share/help/eu/rhythmbox/figures/rb-iradio-main.png
-share/help/eu/rhythmbox/figures/rb-notification-area-menu.png
-share/help/eu/rhythmbox/figures/rb-notification-window.png
 share/help/eu/rhythmbox/figures/rb-notification-zone.png
 share/help/eu/rhythmbox/figures/rb-podcast-main.png
-share/help/eu/rhythmbox/figures/rb-statusbar.png
 share/help/eu/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/eu/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/eu/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/eu/rhythmbox/figures/rb-toolbar.png
 share/help/eu/rhythmbox/figures/rb-volume-changer.png
-share/help/eu/rhythmbox/figures/rb-window-small.png
 share/help/eu/rhythmbox/figures/rb-window.png
 share/help/eu/rhythmbox/index.docbook
 share/help/eu/rhythmbox/legal.xml
-share/help/fr/rhythmbox/fdl-appendix.xml
 share/help/fr/rhythmbox/figures/rb-iradio-main.png
-share/help/fr/rhythmbox/figures/rb-notification-area-menu.png
-share/help/fr/rhythmbox/figures/rb-notification-window.png
 share/help/fr/rhythmbox/figures/rb-notification-zone.png
 share/help/fr/rhythmbox/figures/rb-podcast-main.png
-share/help/fr/rhythmbox/figures/rb-statusbar.png
 share/help/fr/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/fr/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/fr/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/fr/rhythmbox/figures/rb-toolbar.png
 share/help/fr/rhythmbox/figures/rb-volume-changer.png
-share/help/fr/rhythmbox/figures/rb-window-small.png
 share/help/fr/rhythmbox/figures/rb-window.png
 share/help/fr/rhythmbox/index.docbook
 share/help/fr/rhythmbox/legal.xml
-share/help/gl/rhythmbox/fdl-appendix.xml
 share/help/gl/rhythmbox/figures/rb-iradio-main.png
-share/help/gl/rhythmbox/figures/rb-notification-area-menu.png
-share/help/gl/rhythmbox/figures/rb-notification-window.png
 share/help/gl/rhythmbox/figures/rb-notification-zone.png
 share/help/gl/rhythmbox/figures/rb-podcast-main.png
-share/help/gl/rhythmbox/figures/rb-statusbar.png
 share/help/gl/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/gl/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/gl/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/gl/rhythmbox/figures/rb-toolbar.png
 share/help/gl/rhythmbox/figures/rb-volume-changer.png
-share/help/gl/rhythmbox/figures/rb-window-small.png
 share/help/gl/rhythmbox/figures/rb-window.png
 share/help/gl/rhythmbox/index.docbook
 share/help/gl/rhythmbox/legal.xml
-share/help/it/rhythmbox/fdl-appendix.xml
 share/help/it/rhythmbox/figures/rb-iradio-main.png
-share/help/it/rhythmbox/figures/rb-notification-area-menu.png
-share/help/it/rhythmbox/figures/rb-notification-window.png
 share/help/it/rhythmbox/figures/rb-notification-zone.png
 share/help/it/rhythmbox/figures/rb-podcast-main.png
-share/help/it/rhythmbox/figures/rb-statusbar.png
 share/help/it/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/it/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/it/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/it/rhythmbox/figures/rb-toolbar.png
 share/help/it/rhythmbox/figures/rb-volume-changer.png
-share/help/it/rhythmbox/figures/rb-window-small.png
 share/help/it/rhythmbox/figures/rb-window.png
 share/help/it/rhythmbox/index.docbook
 share/help/it/rhythmbox/legal.xml
-share/help/ja/rhythmbox/fdl-appendix.xml
 share/help/ja/rhythmbox/figures/rb-iradio-main.png
-share/help/ja/rhythmbox/figures/rb-notification-area-menu.png
-share/help/ja/rhythmbox/figures/rb-notification-window.png
 share/help/ja/rhythmbox/figures/rb-notification-zone.png
 share/help/ja/rhythmbox/figures/rb-podcast-main.png
-share/help/ja/rhythmbox/figures/rb-statusbar.png
 share/help/ja/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/ja/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/ja/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/ja/rhythmbox/figures/rb-toolbar.png
 share/help/ja/rhythmbox/figures/rb-volume-changer.png
-share/help/ja/rhythmbox/figures/rb-window-small.png
 share/help/ja/rhythmbox/figures/rb-window.png
 share/help/ja/rhythmbox/index.docbook
 share/help/ja/rhythmbox/legal.xml
-share/help/oc/rhythmbox/fdl-appendix.xml
 share/help/oc/rhythmbox/figures/rb-iradio-main.png
-share/help/oc/rhythmbox/figures/rb-notification-area-menu.png
-share/help/oc/rhythmbox/figures/rb-notification-window.png
 share/help/oc/rhythmbox/figures/rb-notification-zone.png
 share/help/oc/rhythmbox/figures/rb-podcast-main.png
-share/help/oc/rhythmbox/figures/rb-statusbar.png
 share/help/oc/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/oc/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/oc/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/oc/rhythmbox/figures/rb-toolbar.png
 share/help/oc/rhythmbox/figures/rb-volume-changer.png
-share/help/oc/rhythmbox/figures/rb-window-small.png
 share/help/oc/rhythmbox/figures/rb-window.png
 share/help/oc/rhythmbox/index.docbook
 share/help/oc/rhythmbox/legal.xml
-share/help/pt/rhythmbox/fdl-appendix.xml
 share/help/pt/rhythmbox/figures/rb-iradio-main.png
-share/help/pt/rhythmbox/figures/rb-notification-area-menu.png
-share/help/pt/rhythmbox/figures/rb-notification-window.png
 share/help/pt/rhythmbox/figures/rb-notification-zone.png
 share/help/pt/rhythmbox/figures/rb-podcast-main.png
-share/help/pt/rhythmbox/figures/rb-statusbar.png
 share/help/pt/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/pt/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/pt/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/pt/rhythmbox/figures/rb-toolbar.png
 share/help/pt/rhythmbox/figures/rb-volume-changer.png
-share/help/pt/rhythmbox/figures/rb-window-small.png
 share/help/pt/rhythmbox/figures/rb-window.png
 share/help/pt/rhythmbox/index.docbook
 share/help/pt/rhythmbox/legal.xml
-share/help/pt_BR/rhythmbox/fdl-appendix.xml
 share/help/pt_BR/rhythmbox/figures/rb-iradio-main.png
-share/help/pt_BR/rhythmbox/figures/rb-notification-area-menu.png
-share/help/pt_BR/rhythmbox/figures/rb-notification-window.png
 share/help/pt_BR/rhythmbox/figures/rb-notification-zone.png
 share/help/pt_BR/rhythmbox/figures/rb-podcast-main.png
-share/help/pt_BR/rhythmbox/figures/rb-statusbar.png
 share/help/pt_BR/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/pt_BR/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/pt_BR/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/pt_BR/rhythmbox/figures/rb-toolbar.png
 share/help/pt_BR/rhythmbox/figures/rb-volume-changer.png
-share/help/pt_BR/rhythmbox/figures/rb-window-small.png
 share/help/pt_BR/rhythmbox/figures/rb-window.png
 share/help/pt_BR/rhythmbox/index.docbook
 share/help/pt_BR/rhythmbox/legal.xml
-share/help/ro/rhythmbox/fdl-appendix.xml
 share/help/ro/rhythmbox/figures/rb-iradio-main.png
-share/help/ro/rhythmbox/figures/rb-notification-area-menu.png
-share/help/ro/rhythmbox/figures/rb-notification-window.png
 share/help/ro/rhythmbox/figures/rb-notification-zone.png
 share/help/ro/rhythmbox/figures/rb-podcast-main.png
-share/help/ro/rhythmbox/figures/rb-statusbar.png
 share/help/ro/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/ro/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/ro/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/ro/rhythmbox/figures/rb-toolbar.png
 share/help/ro/rhythmbox/figures/rb-volume-changer.png
-share/help/ro/rhythmbox/figures/rb-window-small.png
 share/help/ro/rhythmbox/figures/rb-window.png
 share/help/ro/rhythmbox/index.docbook
 share/help/ro/rhythmbox/legal.xml
-share/help/ru/rhythmbox/fdl-appendix.xml
 share/help/ru/rhythmbox/figures/rb-iradio-main.png
-share/help/ru/rhythmbox/figures/rb-notification-area-menu.png
-share/help/ru/rhythmbox/figures/rb-notification-window.png
 share/help/ru/rhythmbox/figures/rb-notification-zone.png
 share/help/ru/rhythmbox/figures/rb-podcast-main.png
-share/help/ru/rhythmbox/figures/rb-statusbar.png
 share/help/ru/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/ru/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/ru/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/ru/rhythmbox/figures/rb-toolbar.png
 share/help/ru/rhythmbox/figures/rb-volume-changer.png
-share/help/ru/rhythmbox/figures/rb-window-small.png
 share/help/ru/rhythmbox/figures/rb-window.png
 share/help/ru/rhythmbox/index.docbook
 share/help/ru/rhythmbox/legal.xml
-share/help/sl/rhythmbox/fdl-appendix.xml
 share/help/sl/rhythmbox/figures/rb-iradio-main.png
-share/help/sl/rhythmbox/figures/rb-notification-area-menu.png
-share/help/sl/rhythmbox/figures/rb-notification-window.png
 share/help/sl/rhythmbox/figures/rb-notification-zone.png
 share/help/sl/rhythmbox/figures/rb-podcast-main.png
-share/help/sl/rhythmbox/figures/rb-statusbar.png
 share/help/sl/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/sl/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/sl/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/sl/rhythmbox/figures/rb-toolbar.png
 share/help/sl/rhythmbox/figures/rb-volume-changer.png
-share/help/sl/rhythmbox/figures/rb-window-small.png
 share/help/sl/rhythmbox/figures/rb-window.png
 share/help/sl/rhythmbox/index.docbook
 share/help/sl/rhythmbox/legal.xml
-share/help/sv/rhythmbox/fdl-appendix.xml
 share/help/sv/rhythmbox/figures/rb-iradio-main.png
-share/help/sv/rhythmbox/figures/rb-notification-area-menu.png
-share/help/sv/rhythmbox/figures/rb-notification-window.png
 share/help/sv/rhythmbox/figures/rb-notification-zone.png
 share/help/sv/rhythmbox/figures/rb-podcast-main.png
-share/help/sv/rhythmbox/figures/rb-statusbar.png
 share/help/sv/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/sv/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/sv/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/sv/rhythmbox/figures/rb-toolbar.png
 share/help/sv/rhythmbox/figures/rb-volume-changer.png
-share/help/sv/rhythmbox/figures/rb-window-small.png
 share/help/sv/rhythmbox/figures/rb-window.png
 share/help/sv/rhythmbox/index.docbook
 share/help/sv/rhythmbox/legal.xml
-share/help/uk/rhythmbox/fdl-appendix.xml
 share/help/uk/rhythmbox/figures/rb-iradio-main.png
-share/help/uk/rhythmbox/figures/rb-notification-area-menu.png
-share/help/uk/rhythmbox/figures/rb-notification-window.png
 share/help/uk/rhythmbox/figures/rb-notification-zone.png
 share/help/uk/rhythmbox/figures/rb-podcast-main.png
-share/help/uk/rhythmbox/figures/rb-statusbar.png
 share/help/uk/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/uk/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/uk/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/uk/rhythmbox/figures/rb-toolbar.png
 share/help/uk/rhythmbox/figures/rb-volume-changer.png
-share/help/uk/rhythmbox/figures/rb-window-small.png
 share/help/uk/rhythmbox/figures/rb-window.png
 share/help/uk/rhythmbox/index.docbook
 share/help/uk/rhythmbox/legal.xml
-share/help/zh_CN/rhythmbox/fdl-appendix.xml
 share/help/zh_CN/rhythmbox/figures/rb-iradio-main.png
-share/help/zh_CN/rhythmbox/figures/rb-notification-area-menu.png
-share/help/zh_CN/rhythmbox/figures/rb-notification-window.png
 share/help/zh_CN/rhythmbox/figures/rb-notification-zone.png
 share/help/zh_CN/rhythmbox/figures/rb-podcast-main.png
-share/help/zh_CN/rhythmbox/figures/rb-statusbar.png
 share/help/zh_CN/rhythmbox/figures/rb-toolbar-prevplaynext.png
 share/help/zh_CN/rhythmbox/figures/rb-toolbar-repeat.png
 share/help/zh_CN/rhythmbox/figures/rb-toolbar-shuffle.png
-share/help/zh_CN/rhythmbox/figures/rb-toolbar.png
 share/help/zh_CN/rhythmbox/figures/rb-volume-changer.png
-share/help/zh_CN/rhythmbox/figures/rb-window-small.png
 share/help/zh_CN/rhythmbox/figures/rb-window.png
 share/help/zh_CN/rhythmbox/index.docbook
 share/help/zh_CN/rhythmbox/legal.xml
-share/icons/hicolor/16x16/apps/rhythmbox.png
-share/icons/hicolor/22x22/apps/rhythmbox.png
-share/icons/hicolor/24x24/apps/rhythmbox.png
-share/icons/hicolor/256x256/apps/rhythmbox.png
-share/icons/hicolor/32x32/apps/rhythmbox.png
-share/icons/hicolor/48x48/apps/rhythmbox.png
-share/icons/hicolor/scalable/apps/rhythmbox-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Rhythmbox-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Rhythmbox.svg
 %%NLS%%share/locale/af/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/am/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/rhythmbox.mo
@ -731,6 +612,7 @@ share/icons/hicolor/scalable/apps/rhythmbox-symbolic.svg
 %%NLS%%share/locale/fa/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/rhythmbox.mo
+%%NLS%%share/locale/fur/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/gd/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/rhythmbox.mo
@ -748,6 +630,7 @@ share/icons/hicolor/scalable/apps/rhythmbox-symbolic.svg
 %%NLS%%share/locale/ko/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/rhythmbox.mo
+%%NLS%%share/locale/mjw/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/mk/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/ml/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/mn/LC_MESSAGES/rhythmbox.mo
@ -783,6 +666,7 @@ share/icons/hicolor/scalable/apps/rhythmbox-symbolic.svg
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
+share/metainfo/rhythmbox.appdata.xml
 %%DATADIR%%/plugins/audioscrobbler/audioscrobbler-preferences.ui
 %%DATADIR%%/plugins/audioscrobbler/audioscrobbler-profile.ui
 %%DATADIR%%/plugins/audioscrobbler/icons/hicolor/scalable/places/Last.fm-symbolic.svg
@ -815,5 +699,6 @@ share/icons/hicolor/scalable/apps/rhythmbox-symbolic.svg
 %%PYTHON%%%%DATADIR%%/plugins/webremote/js/webremote.js
 %%PYTHON%%%%DATADIR%%/plugins/webremote/webremote-config.ui
 %%PYTHON%%%%DATADIR%%/plugins/webremote/webremote.html
+%%PYTHON%%%%DATADIR%%/plugins/listenbrainz/settings.ui
 %%DATADIR%%/rhythmbox.gep
 %%LIRC%%%%DATADIR%%/plugins/rblirc/rhythmbox_lirc_default
--- a/audio/rnnoise-nu/pkg-descr
+++ b/audio/rnnoise-nu/pkg-descr
@ -1,3 +1,5 @@
-RNNoise is a noise suppression library based on a recurrent neural network.
+RNNoise-nu is a noise suppression library based on a recurrent neural network.

-WWW: https://github.com/xiph/rnnoise
+Its a fork of the rnnoise library with altered/generalized functionality.
+
+WWW: https://github.com/GregorR/rnnoise-nu
--- a/audio/rnnoise/Makefile
+++ b/audio/rnnoise/Makefile
@ -0,0 +1,39 @@
+# $FreeBSD$
+
+PORTNAME=	rnnoise
+DISTVERSION=	g20210122
+CATEGORIES=	audio
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Recurrent neural network for audio noise reduction
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		autoreconf gmake libtool
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-static --disable-examples
+USE_LDCONFIG=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	xiph
+GH_TAGNAME=	1cbdbcf
+
+INSTALL_TARGET=	install-strip
+
+OPTIONS_DEFINE=	DOCS
+
+DOCS_CONFIGURE_ENABLE=	doc
+
+PORTDOCS=	* # API documentation feature is broken: https://github.com/xiph/rnnoise/issues/44
+
+PLIST_FILES=	include/rnnoise.h \
+		lib/librnnoise.so \
+		lib/librnnoise.so.0 \
+		lib/librnnoise.so.0.4.1 \
+		libdata/pkgconfig/rnnoise.pc
+
+post-install-DOCS-on:
+	@${RM} ${STAGEDIR}${DOCSDIR}/COPYING
+
+.include <bsd.port.mk>
--- a/audio/rnnoise/distinfo
+++ b/audio/rnnoise/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1612679142
+SHA256 (xiph-rnnoise-g20210122-1cbdbcf_GH0.tar.gz) = e2aedecd6ee74c2c04caa90c4f02c4f1ceca6303d4a24bb59f0c00895b4fdcf0
+SIZE (xiph-rnnoise-g20210122-1cbdbcf_GH0.tar.gz) = 173753
--- a/audio/rnnoise/pkg-descr
+++ b/audio/rnnoise/pkg-descr
@ -0,0 +1,3 @@
+RNNoise is a noise suppression library based on a recurrent neural network.
+
+WWW: https://github.com/xiph/rnnoise
--- a/comms/usbmuxd/Makefile
+++ b/comms/usbmuxd/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	usbmuxd
 DISTVERSION=	1.1.1
+PORTREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/

@ -18,24 +19,32 @@ LIB_DEPENDS=	libplist-2.0.so:devel/libplist \

 USES=		autoreconf cpe libtool localbase pathfix pkgconfig tar:bzip2
 CPE_VENDOR=	nikias_bassen
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-systemd

+SUB_LIST=	USERS=${USERS} \
+		GROUPS=${GROUPS}
+
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
+
 PLIST_FILES=	man/man8/${PORTNAME}.8.gz \
 		sbin/${PORTNAME}
-
 PORTDOCS=	AUTHORS NEWS README.md

-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=		DEVD DOCS
+OPTIONS_DEFAULT=	DEVD

-post-patch:
-# TODO: add devd(8) rule.
-	@${REINPLACE_CMD} \
-		-e '/darwin*/ s,),|dragonfly*|*bsd*),' \
-		${WRKSRC}/configure.ac
+DEVD_SUB_FILES=		${PORTNAME}.conf
+DEVD_PLIST_FILES=	etc/devd/${PORTNAME}.conf

 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

+post-install-DEVD-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/devd
+
 .include <bsd.port.mk>
--- a/comms/usbmuxd/files/patch-configure
+++ b/comms/usbmuxd/files/patch-configure
@ -1,13 +0,0 @@
-Remove bash-ism from configure script
-
--- configure.orig	2021-01-21 13:11:33 UTC
-+++ configure
-@@ -16412,7 +16412,7 @@ $as_echo "#define HAVE_LIBIMOBILEDEVICE 1" >>confdefs.
- 
- 
-     CACHED_CFLAGS="$CFLAGS"
-    CFLAGS+=" $libimobiledevice_CFLAGS"
-+    CFLAGS="$CFLAGS $libimobiledevice_CFLAGS"
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enum idevice_connection_type" >&5
- $as_echo_n "checking for enum idevice_connection_type... " >&6; }
- if ${ac_cv_enum_idevice_connection_type+:} false; then :
--- a/comms/usbmuxd/files/patch-configure.ac
+++ b/comms/usbmuxd/files/patch-configure.ac
@ -0,0 +1,24 @@
+Remove bash-ism from configure script.
+Disable udev/systemd detection for *BSD as the catch-all assumes a Linux
+system. A configuration file for devd(8) is provided by this port instead.
+
+--- configure.ac.orig	2020-06-09 02:57:16 UTC
+++ configure.ac
+@@ -36,7 +36,7 @@ if test "x$have_limd" = "xyes"; then
+     AC_SUBST(libimobiledevice_CFLAGS)
+     AC_SUBST(libimobiledevice_LIBS)
+     CACHED_CFLAGS="$CFLAGS"
+-    CFLAGS+=" $libimobiledevice_CFLAGS"
+    CFLAGS="$CFLAGS $libimobiledevice_CFLAGS"
+     AC_CACHE_CHECK(for enum idevice_connection_type, ac_cv_enum_idevice_connection_type,
+       AC_TRY_COMPILE([
+         #include <libimobiledevice/libimobiledevice.h>
+@@ -125,7 +125,7 @@ case ${host_os} in
+     AC_SUBST(WINDRES)
+     activation_method="manual"
+     ;;
+-  darwin*)
+  darwin*|dragonfly*|*bsd*)
+     win32=false
+     AC_MSG_RESULT([no])
+     # No support for launchd yet
--- a/comms/usbmuxd/files/patch-src_usb.c
+++ b/comms/usbmuxd/files/patch-src_usb.c
@ -0,0 +1,17 @@
+libusb_has_capability() was implemented in r361977 and is only available on:
+FreeBSD >= 1104501, 1201518, 1300098
+However, libusb in all supported versions of FreeBSD supports hotplug events.
+
+This patch can be safely removed after 11.4 and 12.1 EOL.
+
+--- src/usb.c.orig	2021-01-21 10:10:40 UTC
+++ src/usb.c
+@@ -815,7 +815,7 @@ int usb_init(void)
+ 	collection_init(&device_list);
+ 
+ #ifdef HAVE_LIBUSB_HOTPLUG_API
+-	if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) {
+	if (1) {
+ 		usbmuxd_log(LL_INFO, "Registering for libusb hotplug events");
+ 		res = libusb_hotplug_register_callback(NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, LIBUSB_HOTPLUG_ENUMERATE, VID_APPLE, LIBUSB_HOTPLUG_MATCH_ANY, 0, usb_hotplug_cb, NULL, &usb_hotplug_cb_handle);
+ 		if (res == LIBUSB_SUCCESS) {
--- a/comms/usbmuxd/files/usbmuxd.conf.in
+++ b/comms/usbmuxd/files/usbmuxd.conf.in
@ -0,0 +1,28 @@
+# $FreeBSD$
+#
+# This entry starts the Apple mobile device muxer 'usbmuxd' upon device attach
+# of a matching Apple product including iPhone, iPad, and iPod. It also allows
+# members of the '%%GROUPS%%' group to access the devices.
+#
+# Multiple devices may be attached simultaneously. The muxer will stop upon
+# detach of the last matching device.
+
+notify 100 {
+	match "system"		"USB";
+	match "subsystem"	"DEVICE";
+	match "type"		"ATTACH";
+	match "vendor"		"0x05ac";
+	match "product"		"(0x12[9a][0-9a-f]|0x8600)";
+	action "chgrp %%GROUPS%% /dev/$cdev; chmod g+rw /dev/$cdev";
+	action "%%PREFIX%%/sbin/usbmuxd -U %%USERS%% -z";
+};
+
+notify 100 {
+        match "system"          "USB";
+        match "subsystem"       "DEVICE";
+        match "type"            "DETACH";
+        match "vendor"          "0x05ac";
+	match "product"         "(0x12[9a][0-9a-f]|0x8600)";
+	action "%%PREFIX%%/sbin/usbmuxd -x";
+};
+
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	osm2pgsql
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.1
 CATEGORIES=	converters geography

 MAINTAINER=	amdmi3@FreeBSD.org
--- a/converters/osm2pgsql/distinfo
+++ b/converters/osm2pgsql/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1607605279
-SHA256 (openstreetmap-osm2pgsql-1.4.0_GH0.tar.gz) = 403e25a0310d088183a868d80e5325dceee88617d0df570056e50a2930905369
-SIZE (openstreetmap-osm2pgsql-1.4.0_GH0.tar.gz) = 2429430
+TIMESTAMP = 1612479382
+SHA256 (openstreetmap-osm2pgsql-1.4.1_GH0.tar.gz) = 33c4817dceed99764b089ead0e8e2f67c4c6675e761772339b635800970e66e2
+SIZE (openstreetmap-osm2pgsql-1.4.1_GH0.tar.gz) = 2463328
--- a/converters/rubygem-json-ld/Makefile
+++ b/converters/rubygem-json-ld/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	json-ld
-PORTVERSION=	3.1.7
+PORTVERSION=	3.1.8
 CATEGORIES=	converters rubygems
 MASTER_SITES=	RG

--- a/converters/rubygem-json-ld/distinfo
+++ b/converters/rubygem-json-ld/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1609953937
-SHA256 (rubygem/json-ld-3.1.7.gem) = eb4c0a7ecf479a6a3b966aebcad781a3276a9bc528910f8260763656a82b9941
-SIZE (rubygem/json-ld-3.1.7.gem) = 164864
+TIMESTAMP = 1612519159
+SHA256 (rubygem/json-ld-3.1.8.gem) = d323d5df41c1f9317936b39a7b000844ff20bd717e82a3460f865eb50dbb8759
+SIZE (rubygem/json-ld-3.1.8.gem) = 168960
--- a/databases/Makefile
+++ b/databases/Makefile
@ -735,6 +735,7 @@
    SUBDIR += py-Pyrseas
    SUBDIR += py-aesqlapius
    SUBDIR += py-agate-sql
+    SUBDIR += py-aiomysql
    SUBDIR += py-aiopg
    SUBDIR += py-aioredis
    SUBDIR += py-aiosqlite
--- a/databases/R-cran-cachem/Makefile
+++ b/databases/R-cran-cachem/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	cachem
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.3
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${PORTVERSION}

--- a/databases/R-cran-cachem/distinfo
+++ b/databases/R-cran-cachem/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1612026858
-SHA256 (cachem_1.0.1.tar.gz) = 8e65d0e84f6898d4307d6d848ed99d47f156fe31589b7e5a723cedde3d31b822
-SIZE (cachem_1.0.1.tar.gz) = 19386
+TIMESTAMP = 1612533330
+SHA256 (cachem_1.0.3.tar.gz) = 79dc9746366550e07132ac97d77632b70f9e8ce9493f84ed607b584f4d5a7278
+SIZE (cachem_1.0.3.tar.gz) = 21268
--- a/databases/cassandra4/files/patch-build.xml
+++ b/databases/cassandra4/files/patch-build.xml
@ -34,6 +34,15 @@
             <include name="**/*.jar" />
             <exclude name="**/*-sources.jar"/>
             <exclude name="**/ant-*.jar"/>
+@@ -291,7 +292,7 @@
+         windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
+         bottom="Copyright &amp;copy; 2009-2020 The Apache Software Foundation"
+         useexternalfile="yes" encoding="UTF-8" failonerror="false"
+-        maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">
+        maxmemory="512m" additionalparam="${jdk11-javadoc-exports}">
+         <filesets/>
+       </javadoc>
+       <fail message="javadoc failed">
@@ -416,8 +417,7 @@
         <artifact:dependencies pathId="wikitext.classpath">
             <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	db
-PORTVERSION=	1.14
+PORTVERSION=	1.16
 PORTEPOCH=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.mavetju.org/download/
--- a/databases/db/distinfo
+++ b/databases/db/distinfo
@ -1,2 +1,3 @@
-SHA256 (db-1.14.tar.gz) = 0c66fc7df0ddb70915bcd6d17cf5ed0049d8cff01fcaadd95069126722770e73
-SIZE (db-1.14.tar.gz) = 6908
+TIMESTAMP = 1612663351
+SHA256 (db-1.16.tar.gz) = e2cc18621932fb9769ef4fdf17a538e619a358ec0ab14c085c666b022afef359
+SIZE (db-1.16.tar.gz) = 6860
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	grass
 PORTVERSION=	7.8.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
@ -135,12 +135,6 @@ ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd

 .include <bsd.port.pre.mk>

-.if ${ARCH} == "aarch64" || ${ARCH} == "riscv64"
-PLIST_SUB+=	WOSBRK="@comment "
-.else
-PLIST_SUB+=	WOSBRK=""
-.endif
-
 .if ${ARCH} == "i386" && ${OSVERSION} < 1200000
 # clang 7.x and 8.x do not build properly on 11i386
 CPP=		clang-cpp${LLVM_DEFAULT}
--- a/databases/grass7/files/patch-raster_r.terraflow_stats.cpp
+++ b/databases/grass7/files/patch-raster_r.terraflow_stats.cpp
@ -0,0 +1,47 @@
+--- raster/r.terraflow/stats.cpp.orig	2020-12-21 18:40:15 UTC
+++ raster/r.terraflow/stats.cpp
+@@ -126,44 +126,7 @@ statsRecorder::statsRecorder(char *fname) : ofstream(n
+   //ofstream that takes an fd; wrote another noclobber() function that
+   //closes fd and returns the name;
+   rt_start(tm);
+-#ifndef __MINGW32__
+-  bss = sbrk(0);
+-#endif
+-  char buf[BUFSIZ];
+-  *this << freeMem(buf) << endl;
+ }
+-
+-/* ********************************************************************** */
+-
+-long 
+-statsRecorder::freeMem() {
+-#ifdef __MINGW32__
+-  return -1;
+-#else
+-  struct rlimit rlim;
+-  if (getrlimit(RLIMIT_DATA, &rlim) == -1) {
+-	perror("getrlimit: ");
+-	return -1;
+-  } 	
+-  /* printf("getrlimit returns: %d \n", rlim.rlim_cur); */
+-  if (rlim.rlim_cur == RLIM_INFINITY) {
+-	/* printf("rlim is infinity\n"); */
+-	/* should fix this */
+-	return -1; 
+-  } 
+-  long freeMem = rlim.rlim_cur - ((char*)sbrk(0)-(char*)bss);
+-  return freeMem;
+-#endif /* __MINGW32__ */
+-}
+-
+-char *
+-statsRecorder::freeMem(char *buf) {
+-  char buf2[BUFSIZ];
+-  sprintf(buf, "Free Memory=%s", formatNumber(buf2, freeMem()));
+-  return buf;
+-}
+-
+-
+ 
+ /* ********************************************************************** */
+ 
--- a/databases/grass7/files/patch-raster_r.terraflow_stats.h
+++ b/databases/grass7/files/patch-raster_r.terraflow_stats.h
@ -0,0 +1,17 @@
+--- raster/r.terraflow/stats.h.orig	2020-12-21 18:40:15 UTC
+++ raster/r.terraflow/stats.h
+@@ -35,14 +35,11 @@ int noclobberFile(char *);
+ class statsRecorder : public ofstream {
+ private:
+   Rtimer tm;
+-  void *bss;
+ public:
+   statsRecorder(char *fname);
+   ~statsRecorder() { 
+ 	this->flush(); 
+   }
+-  char *freeMem(char *);
+-  long freeMem();
+   char *timestamp();
+   void timestamp(const char *s);
+   void comment(const char *s, const int verbose=1);
--- a/databases/grass7/pkg-plist
+++ b/databases/grass7/pkg-plist
@ -240,7 +240,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/bin/r.surf.gauss
 %%GRASS_INST_DIR%%/bin/r.surf.idw
 %%GRASS_INST_DIR%%/bin/r.surf.random
-%%WOSBRK%%%%GRASS_INST_DIR%%/bin/r.terraflow
+%%GRASS_INST_DIR%%/bin/r.terraflow
 %%GRASS_INST_DIR%%/bin/r.texture
 %%GRASS_INST_DIR%%/bin/r.thin
 %%GRASS_INST_DIR%%/bin/r.tile
--- a/databases/kyototycoon/Makefile
+++ b/databases/kyototycoon/Makefile
@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet

-OPTIONS_DEFINE=	DOCS LZO
+USES=		gmake pkgconfig

 CONFIGURE_ARGS=	--enable-uyield
 CPPFLAGS+=	-fPIC
@ -27,8 +27,10 @@ REINPLACE_ARGS=	-i ''
 TEST_TARGET=	check
 USE_CXXSTD=	gnu++98
 USE_LDCONFIG=	yes
-USE_RC_SUBR=	${PORTNAME}
-USES=		gmake pkgconfig
+USE_RC_SUBR=	kyototycoon
+
+USERS=		${KYOTOTYCOON_USER}
+GROUPS=		${KYOTOTYCOON_GROUP}

 PLIST_SUB=	KYOTOTYCOON_USER=${KYOTOTYCOON_USER} \
 		KYOTOTYCOON_GROUP=${KYOTOTYCOON_GROUP} \
@ -36,21 +38,20 @@ PLIST_SUB=	KYOTOTYCOON_USER=${KYOTOTYCOON_USER} \
 		KYOTOTYCOON_LOGDIR=${KYOTOTYCOON_LOGDIR} \
 		KYOTOTYCOON_PIDFILE=${KYOTOTYCOON_PIDFILE}
 PORTDOCS=	*
-SUB_FILES=	${PORTNAME}
+SUB_FILES=	kyototycoon
 SUB_LIST=	KYOTOTYCOON_USER=${KYOTOTYCOON_USER} \
 		KYOTOTYCOON_GROUP=${KYOTOTYCOON_GROUP} \
 		KYOTOTYCOON_DBDIR=${KYOTOTYCOON_DBDIR} \
 		KYOTOTYCOON_LOGDIR=${KYOTOTYCOON_LOGDIR} \
 		KYOTOTYCOON_PIDFILE=${KYOTOTYCOON_PIDFILE}

-USERS=		${KYOTOTYCOON_USER}
-GROUPS=		${KYOTOTYCOON_GROUP}
+KYOTOTYCOON_USER?=	kyototycoon
+KYOTOTYCOON_GROUP?=	kyototycoon
+KYOTOTYCOON_DBDIR?=	/var/db/kyototycoon
+KYOTOTYCOON_LOGDIR?=	/var/log/kyototycoon
+KYOTOTYCOON_PIDFILE?=	/var/run/kyototycoon.pid

-KYOTOTYCOON_USER?=	${PORTNAME}
-KYOTOTYCOON_GROUP?=	${PORTNAME}
-KYOTOTYCOON_DBDIR?=	/var/db/${PORTNAME}
-KYOTOTYCOON_LOGDIR?=	/var/log/${PORTNAME}
-KYOTOTYCOON_PIDFILE?=	/var/run/${PORTNAME}.pid
+OPTIONS_DEFINE=	DOCS LZO

 LZO_CONFIGURE_OFF=	ac_cv_lib_lzo2_main=no
 LZO_CONFIGURE_ON=	ac_cv_lib_lzo2_main=yes
--- a/databases/mongodb-tools/Makefile
+++ b/databases/mongodb-tools/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	mongodb-tools
-DISTVERSION=	100.2.1
+DISTVERSION=	100.3.0
 CATEGORIES=	databases

 MAINTAINER=	ronald-lists@klop.ws
--- a/databases/mongodb-tools/distinfo
+++ b/databases/mongodb-tools/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1606309803
-SHA256 (mongodb-mongo-tools-100.2.1_GH0.tar.gz) = 33e6777b94bade0417b757f391ae1e71073a389e991ab6c59392e368552fb5e6
-SIZE (mongodb-mongo-tools-100.2.1_GH0.tar.gz) = 27447213
+TIMESTAMP = 1612421557
+SHA256 (mongodb-mongo-tools-100.3.0_GH0.tar.gz) = e59f1c96e2349f6797e9818b04b4a378f8c4bad20be150fe931195d290e162ce
+SIZE (mongodb-mongo-tools-100.3.0_GH0.tar.gz) = 27514743
--- a/databases/mongodb42/Makefile
+++ b/databases/mongodb42/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	4.2.11
+DISTVERSION=	4.2.12
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/
--- a/databases/mongodb42/distinfo
+++ b/databases/mongodb42/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1606309528
-SHA256 (mongodb-src-r4.2.11.tar.gz) = ab5a8b6e967614a8ad67c0ca87124c4f380d4a476508973a7995d54ed902b02e
-SIZE (mongodb-src-r4.2.11.tar.gz) = 61829417
+TIMESTAMP = 1612366688
+SHA256 (mongodb-src-r4.2.12.tar.gz) = 79b0eee164d51b948bb65cf8f845a35db736d4e083b6be6695835c9dbb40549d
+SIZE (mongodb-src-r4.2.12.tar.gz) = 61855596
--- a/databases/mysqltuner/Makefile
+++ b/databases/mysqltuner/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	mysqltuner
-PORTVERSION=	1.7.17
+PORTVERSION=	1.7.21
 CATEGORIES=	databases

 MAINTAINER=	pi@FreeBSD.org
--- a/databases/mysqltuner/distinfo
+++ b/databases/mysqltuner/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1575231139
-SHA256 (major-MySQLTuner-perl-1.7.17_GH0.tar.gz) = c82f29aa017360ab8888808393bd06e79af6fa447a62908a3b3dddea92b768b5
-SIZE (major-MySQLTuner-perl-1.7.17_GH0.tar.gz) = 213429
+TIMESTAMP = 1612602439
+SHA256 (major-MySQLTuner-perl-1.7.21_GH0.tar.gz) = b6e39f0768a132bca59708f4d7b0edba935a0f59bbb3ac38023d5835f7563caa
+SIZE (major-MySQLTuner-perl-1.7.21_GH0.tar.gz) = 223961
--- a/databases/p5-DBIx-Admin-CreateTable/Makefile
+++ b/databases/p5-DBIx-Admin-CreateTable/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	DBIx-Admin-CreateTable
-PORTVERSION=	2.10
-PORTREVISION=	1
+PORTVERSION=	2.11
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@ -11,7 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Create and drop tables, primary indexes, and sequences

-LICENSE=	ART20
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+LICENSE_FILE_ART10=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
--- a/databases/p5-DBIx-Admin-CreateTable/distinfo
+++ b/databases/p5-DBIx-Admin-CreateTable/distinfo
@ -1,2 +1,3 @@
-SHA256 (DBIx-Admin-CreateTable-2.10.tgz) = e9ce9e4581ab7dbfaa57ca36bd5437b9cdf50a51e11df40d9c15bbf095addc24
-SIZE (DBIx-Admin-CreateTable-2.10.tgz) = 12637
+TIMESTAMP = 1612519115
+SHA256 (DBIx-Admin-CreateTable-2.11.tgz) = 07b1427fbc15455657ca57217749004162a50c04abb243022a5b479e4b2a5912
+SIZE (DBIx-Admin-CreateTable-2.11.tgz) = 19156
--- a/databases/p5-DBIx-Admin-TableInfo/Makefile
+++ b/databases/p5-DBIx-Admin-TableInfo/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	DBIx-Admin-TableInfo
-PORTVERSION=	3.03
+PORTVERSION=	3.04
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@ -12,7 +12,7 @@ COMMENT=	Wrapper for all of table_info(), column_info(), *_key_info()

 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE_ART10=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
--- a/databases/p5-DBIx-Admin-TableInfo/distinfo
+++ b/databases/p5-DBIx-Admin-TableInfo/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1478369941
-SHA256 (DBIx-Admin-TableInfo-3.03.tgz) = a852530f95957a43aa794f2edf5f3fe4ecec35bd20150c38136d4c23d85328b6
-SIZE (DBIx-Admin-TableInfo-3.03.tgz) = 50317
+TIMESTAMP = 1612519117
+SHA256 (DBIx-Admin-TableInfo-3.04.tgz) = b9625992683b97378bea0947773f50e3c9f81974048b84f4c3422cae7e6082f4
+SIZE (DBIx-Admin-TableInfo-3.04.tgz) = 49647
--- a/databases/p5-SQL-Abstract-More/Makefile
+++ b/databases/p5-SQL-Abstract-More/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	SQL-Abstract-More
-PORTVERSION=	1.34
+PORTVERSION=	1.37
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@ -23,8 +23,9 @@ TEST_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
 		p5-Test-Exception>=0:devel/p5-Test-Exception \
 		p5-Test-Pod>=0:devel/p5-Test-Pod

-NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure

+NO_ARCH=	yes
+
 .include <bsd.port.mk>
--- a/databases/p5-SQL-Abstract-More/distinfo
+++ b/databases/p5-SQL-Abstract-More/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1610037588
-SHA256 (SQL-Abstract-More-1.34.tar.gz) = b4f7e98f77f40e715fb9ca541453b273a7fa0ac5d2323a57e4cfe700eea4736a
-SIZE (SQL-Abstract-More-1.34.tar.gz) = 59620
+TIMESTAMP = 1612023066
+SHA256 (SQL-Abstract-More-1.37.tar.gz) = f88095c5589b242424351eb4e319cf6545dce279b3988dcaea6f0f65e52ff2ac
+SIZE (SQL-Abstract-More-1.37.tar.gz) = 62733
--- a/databases/postgis31/Makefile
+++ b/databases/postgis31/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	postgis
-PORTVERSION=	3.1.0
+PORTVERSION=	3.1.1
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	31
--- a/databases/postgis31/distinfo
+++ b/databases/postgis31/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1608358027
-SHA256 (postgis-3.1.0.tar.gz) = da06e2456876cd0c6a9bee0636ff700982e900c597d1e4cb80a99a2623400201
-SIZE (postgis-3.1.0.tar.gz) = 17262134
+TIMESTAMP = 1612465959
+SHA256 (postgis-3.1.1.tar.gz) = 0e96afef586db6939d48fb22fbfbc9d0de5e6bc1722d6d553d63bb41441a2a7d
+SIZE (postgis-3.1.1.tar.gz) = 17261826
--- a/databases/postgis31/pkg-plist
+++ b/databases/postgis31/pkg-plist
@ -171,16 +171,16 @@ share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.1--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.2--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.0--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--ANY--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer.control
 %%ADDRSTD%%share/postgresql/extension/address_standardizer.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.control
 %%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.sql
@ -243,9 +243,9 @@ share/postgresql/extension/postgis--3.0.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.0.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.0.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.0.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+share/postgresql/extension/postgis--3.1.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--ANY--%%PORTVERSION%%.sql
@ -311,9 +311,9 @@ share/postgresql/extension/postgis.control
 %%RASTER%%share/postgresql/extension/postgis_raster--3.0.1--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--3.0.2--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--3.0.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.0--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--ANY--%%PORTVERSION%%.sql
@ -379,9 +379,9 @@ share/postgresql/extension/postgis.control
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.1--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.2--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.0--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--ANY--%%PORTVERSION%%.sql
@ -447,8 +447,8 @@ share/postgresql/extension/postgis_tiger_geocoder--3.0.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
@ -514,8 +514,8 @@ share/postgresql/extension/postgis_tiger_geocoder.control
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.1--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.2--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.0--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
--- a/databases/postgresql-ogr_fdw/Makefile
+++ b/databases/postgresql-ogr_fdw/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	ogr_fdw
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.12
+DISTVERSION=	1.1.0
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-

@ -24,7 +24,8 @@ MAKE_ENV=	USE_PGXS=1

 PLIST_FILES=	bin/ogr_fdw_info \
 		lib/postgresql/ogr_fdw.so \
-		share/postgresql/extension/ogr_fdw--1.0.sql \
+		share/postgresql/extension/ogr_fdw--1.0--1.1.sql \
+		share/postgresql/extension/ogr_fdw--1.1.sql \
 		share/postgresql/extension/ogr_fdw.control

 post-install:
--- a/Show More
+++ b/Show More