*/*: sync with upstream

Taken from: FreeBSD
2021-10-27 09:12:22 +02:00 · 2021-10-27 09:12:22 +02:00 · 0969a9113b
parent 86ac80a572
commit 0969a9113b
2218 changed files with 16222 additions and 11099 deletions
--- a/accessibility/sctd/Makefile
+++ b/accessibility/sctd/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	sctd
 DISTVERSION=	0.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	accessibility

 MAINTAINER=	0mp@FreeBSD.org
@ -13,7 +13,6 @@ LICENSE_FILE_CC0-1.0=	${WRKSRC}/LICENSE
 USES=			cargo xorg
 USE_GITHUB=		yes
 GH_ACCOUNT=		amir
-GH_TUPLE=		amir:spa-rs:fa80d0ce99d675674cf1a7cc9cf2ee2e33f501ea:spa
 USE_XORG=		x11 xrandr
 CARGO_CRATES=	ansi_term-0.11.0 \
 		atty-0.2.14 \
@ -40,8 +39,8 @@ CARGO_CRATES=	ansi_term-0.11.0 \
 		winapi-0.3.8 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		x11-2.18.2
-CARGO_USE_GITHUB=	yes
+		x11-2.18.2 \
+		spa@git+https://github.com/amir/spa-rs?branch=pub-SolarPos\#fa80d0ce99d675674cf1a7cc9cf2ee2e33f501ea

 PLIST_FILES=	bin/sctd

--- a/archivers/py-brotli/Makefile
+++ b/archivers/py-brotli/Makefile
@ -21,6 +21,6 @@ CPE_VENDOR=	google
 SHEBANG_FILES=	python/bro.py

 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_brotli*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +

 .include <bsd.port.mk>
--- a/archivers/py-brotlicffi/Makefile
+++ b/archivers/py-brotlicffi/Makefile
@ -22,9 +22,10 @@ USE_PYTHON=	autoplist concurrent distutils
 MAKE_ENV=	USE_SHARED_BROTLI=1

 post-patch:
+# Clean up bundled libraries
 	@${RM} -fr ${WRKSRC}/libbrotli/

 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/brotlicffi/_brotlicffi*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +

 .include <bsd.port.mk>
--- a/archivers/py-zopfli/Makefile
+++ b/archivers/py-zopfli/Makefile
@ -1,7 +1,7 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>

 PORTNAME=	zopfli
-PORTVERSION=	0.1.8
+PORTVERSION=	0.1.9
 CATEGORIES=	archivers python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -12,7 +12,12 @@ COMMENT=	Zopfli module for python
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING

+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+
 USES=		python:3.6+ zip
 USE_PYTHON=	autoplist concurrent distutils

+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
+
 .include <bsd.port.mk>
--- a/archivers/py-zopfli/distinfo
+++ b/archivers/py-zopfli/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1618320088
-SHA256 (zopfli-0.1.8.zip) = 8b977dc07e3797907ab59e08096583bcd0b7e6c739849fbbeec09263f6356623
-SIZE (zopfli-0.1.8.zip) = 75707
+TIMESTAMP = 1635181027
+SHA256 (zopfli-0.1.9.zip) = 78de3cc08a8efaa8013d61528907d91ac4d6cc014ffd8a41cc10ee75e9e60d7b
+SIZE (zopfli-0.1.9.zip) = 79873
--- a/archivers/py-zopfli/pkg-descr
+++ b/archivers/py-zopfli/pkg-descr
@ -2,4 +2,4 @@ pyzopfli is a straightforward Python wrapper around zopfli's ZlibCompress
 method. It also wraps GzipCompress, but the API point does not try to mimic the
 gzip module.

-WWW: https://github.com/obp/py-zopfli
+WWW: https://github.com/fonttools/py-zopfli
--- a/archivers/py-zstandard/Makefile
+++ b/archivers/py-zstandard/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	zstandard
-DISTVERSION=	0.15.2
+DISTVERSION=	0.16.0
 CATEGORIES=	archivers python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/archivers/py-zstandard/distinfo
+++ b/archivers/py-zstandard/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1614538627
-SHA256 (zstandard-0.15.2.tar.gz) = 52de08355fd5cfb3ef4533891092bb96229d43c2069703d4aff04fdbedf9c92f
-SIZE (zstandard-0.15.2.tar.gz) = 1012864
+TIMESTAMP = 1634885145
+SHA256 (zstandard-0.16.0.tar.gz) = eaae2d3e8fdf8bfe269628385087e4b648beef85bb0c187644e7df4fb0fe9046
+SIZE (zstandard-0.16.0.tar.gz) = 563633
--- a/astro/py-astlib/Makefile
+++ b/astro/py-astlib/Makefile
@ -25,6 +25,6 @@ USE_PYTHON=	autoplist concurrent distutils
 PORTSCOUT=	skipv:0.15,0.17,0.17.1 # incorrect versioning upstream

 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/PyWCSTools/*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +

 .include <bsd.port.mk>
--- a/astro/py-pymetar/Makefile
+++ b/astro/py-pymetar/Makefile
@ -1,7 +1,7 @@
 # Created by: Hye-Shik Chang <perky@fallin.lv>

 PORTNAME=	pymetar
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	astro geography python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/astro/py-pymetar/distinfo
+++ b/astro/py-pymetar/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1625585486
-SHA256 (pymetar-1.3.tar.gz) = ce1b97399208ce1e69d020ceb2250d4ea7970e81c571fd413e0f3af1f73b0888
-SIZE (pymetar-1.3.tar.gz) = 3162924
+TIMESTAMP = 1634391118
+SHA256 (pymetar-1.4.tar.gz) = 48dbe6c4929961021cb61e49bb9e0605b54c4b61b9fb9ade51076705a08ecd54
+SIZE (pymetar-1.4.tar.gz) = 3162928
--- a/audio/Makefile
+++ b/audio/Makefile
@ -319,6 +319,7 @@
    SUBDIR += id3v2
    SUBDIR += ifp-line
    SUBDIR += infamous-plugins-lv2
+    SUBDIR += inscore
    SUBDIR += intersect-lv2
    SUBDIR += invada-studio-plugins-lv2
    SUBDIR += ir-lv2
--- a/audio/asterisk-espeak/Makefile
+++ b/audio/asterisk-espeak/Makefile
@ -12,14 +12,9 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libespeak.so:audio/espeak \
 		libsamplerate.so:audio/libsamplerate

-FLAVORS=			asterisk18 asterisk16 asterisk13
+FLAVORS=			asterisk18 asterisk16
 FLAVOR?=			${FLAVORS:[1]}

-asterisk13_PKGNAMEPREFIX=	asterisk13-
-asterisk13_CONFLICTS_INSTALL=	asterisk16-espeak asterisk18-espeak
-asterisk13_BUILD_DEPENDS=	asterisk:net/asterisk13
-asterisk13_RUN_DEPENDS=		asterisk:net/asterisk13
-
 asterisk16_PKGNAMEPREFIX=	asterisk16-
 asterisk16_CONFLICTS_INSTALL=	asterisk13-espeak asterisk18-espeak
 asterisk16_BUILD_DEPENDS=	asterisk:net/asterisk16
--- a/audio/asterisk-flite/Makefile
+++ b/audio/asterisk-flite/Makefile
@ -11,14 +11,9 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	libflite.so:audio/flite

-FLAVORS=			asterisk18 asterisk16 asterisk13
+FLAVORS=			asterisk18 asterisk16
 FLAVOR?=			${FLAVORS:[1]}

-asterisk13_PKGNAMEPREFIX=	asterisk13-
-asterisk13_CONFLICTS_INSTALL=	asterisk16-flite asterisk18-flite
-asterisk13_BUILD_DEPENDS=	asterisk:net/asterisk13
-asterisk13_RUN_DEPENDS=		asterisk:net/asterisk13
-
 asterisk16_PKGNAMEPREFIX=	asterisk16-
 asterisk16_CONFLICTS_INSTALL=	asterisk13-flite asterisk18-flite
 asterisk16_BUILD_DEPENDS=	asterisk:net/asterisk16
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@ -11,7 +11,10 @@ COMMENT=	MPEG-2 and MPEG-4 AAC audio decoder
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		autoreconf gmake libtool localbase:ldflags
+USES=		autoreconf cpe gmake libtool localbase:ldflags
+CPE_VENDOR=	audiocoding
+CPE_PRODUCT=	freeware_advanced_audio_decoder_2
+
 INSTALL_TARGET=	install-strip

 GNU_CONFIGURE=	yes
--- a/audio/gnome-podcasts/Makefile
+++ b/audio/gnome-podcasts/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	podcasts
 DISTVERSION=	0.4.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 PKGNAMEPREFIX=	gnome-

@ -18,11 +18,9 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libhandy-1.so:x11-toolkits/libhandy

 USES=		cargo gettext gnome meson pkgconfig python:build shebangfix sqlite ssl
-USE_GITHUB=	nodefault
 USE_GITLAB=	yes
 USE_GNOME=	gdkpixbuf2 gtk30
 USE_GSTREAMER1=	bad good libav
-GH_TUPLE=	danigm:gettext-rs:61938b9f5f1d3bdc31f9839f53fabe5ccf136a78:gettextrs
 GL_SITE=	https://gitlab.gnome.org
 GL_ACCOUNT=	World
 GL_COMMIT=	e93a7ddabfe8289138280c3f613038b809b5033d
@ -89,7 +87,6 @@ CARGO_CRATES=	aho-corasick-0.7.13 \
 		futures-task-0.3.5 \
 		futures-util-0.3.5 \
 		gdk-0.13.1 \
-		gettext-sys-0.19.9 \
 		gdk-pixbuf-0.9.0 \
 		gdk-pixbuf-sys-0.10.0 \
 		gdk-sys-0.10.0 \
@ -290,8 +287,8 @@ CARGO_CRATES=	aho-corasick-0.7.13 \
 		ws2_32-sys-0.2.1 \
 		xdg-2.2.0 \
 		xml-rs-0.8.3 \
-		xml5ever-0.16.1
-CARGO_USE_GITHUB=	yes
+		xml5ever-0.16.1 \
+		gettext-rs,gettext-sys@git+https://github.com/danigm/gettext-rs?branch=no-gettext\#61938b9f5f1d3bdc31f9839f53fabe5ccf136a78
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
--- a/audio/guidolib/Makefile
+++ b/audio/guidolib/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	guidolib
-DISTVERSIONPREFIX=	v
-DISTVERSION=	168
-PORTREVISION=	2
+PORTVERSION=	1.7.1 # https://guido.grame.fr/dox/api/ has version in the format N.N.N
+PORTEPOCH=	1
 CATEGORIES=	audio graphics print

 MAINTAINER=	yuri@FreeBSD.org
@ -10,25 +9,24 @@ COMMENT=	Library for graphic rendering of music scores
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BUILD_DEPENDS=	cmake:devel/cmake
 LIB_DEPENDS=	libmidisharelight.so:audio/midisharelight

-USES=		compiler:c++11-lang gl gmake gnome localbase:ldflags pkgconfig qt:5 xorg
-USE_GITHUB=	yes
-GH_ACCOUNT=	grame-cncm
+USES=		compiler:c++11-lang gl cmake gnome localbase:ldflags pkgconfig qt:5 xorg
 USE_QT=		core gui widgets printsupport xml buildtools_build qmake_build
 USE_GL=		gl
 USE_GNOME=	cairo
 USE_LDCONFIG=	yes

-BUILD_WRKSRC=	${WRKSRC}/build
-INSTALL_WRKSRC=	${WRKSRC}/build
+USE_GITHUB=	yes
+GH_ACCOUNT=	grame-cncm
+GH_TAGNAME=	v${PORTVERSION:S/.//g}

-MAKE_ARGS=	LINUXMIDI=no
+CMAKE_SOURCE_PATH=	${WRKSRC}/build

 LDFLAGS+=	-lmidisharelight

 OPTIONS_DEFINE=	DOCS EXAMPLES
+
 PORTDOCS=	*
 PORTEXAMPLES=	*

@ -37,34 +35,6 @@ BINARY_ALIAS=	qmake=${QMAKE}
 post-extract:
 	@${RM} -r ${WRKSRC}/src/midisharelight

-post-patch:
-	@${REINPLACE_CMD} -i '' -E ' \
-		s|Linux|FreeBSD|; \
-		s|-DMIDIEXPORT=yes|-DMIDIEXPORT=off|' \
-		$$(${FIND} ${WRKSRC} -name Makefile) \
-		$$(${FIND} ${WRKSRC}/environments/Qt -name Make.shared)
-	@${REINPLACE_CMD} -i '' -e ' \
-		s|PUBLIC_HEADER DESTINATION /usr/include/guido|PUBLIC_HEADER DESTINATION ${PREFIX}/include/guido|; \
-		s|LIBDEST /usr/lib|LIBDEST ${PREFIX}/lib|; \
-		s|LIBPATH "/usr/lib"|LIBPATH "${LOCALBASE}/lib"|; \
-		s|-L/usr/local|-L${LOCALBASE}|' \
-		${WRKSRC}/build/CMakeLists.txt
-	@${REINPLACE_CMD} -i '' -e ' \
-		s|-lGUIDOEngine|-L${WRKSRC}/build -lGUIDOEngine|' \
-		${WRKSRC}/environments/Qt/apps/GUIDOEngine.shared \
-		${WRKSRC}/environments/Qt/GuidoServer/GUIDOEngineLink.pri \
-		${WRKSRC}/environments/Qt/libs/GuidoQt/GuidoQt.pro \
-		${WRKSRC}/environments/Qt/apps/guido2image/Makefile \
-		${WRKSRC}/src/tools/Makefile \
-		${WRKSRC}/validate/Makefile
-	@${REINPLACE_CMD} -i '' -e ' \
-		s|!android:CONFIG += staticlib|#!android:CONFIG += staticlib|' \
-		${WRKSRC}/environments/Qt/libs/GuidoQt/GuidoQt.pro
-	@${REINPLACE_CMD} -i '' -e ' \
-		s|/usr|$$(DESTDIR)$$(PREFIX)|; \
-		s|libGuidoQt.a|libGuidoQt.*|' \
-		${WRKSRC}/environments/Qt/libs/Makefile
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libGUIDOEngine.so.*
 	${RM} -r ${STAGEDIR}${DATADIR}/python
@ -74,8 +44,4 @@ do-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/package/doc/*.pdf ${STAGEDIR}${DOCSDIR}
 	${CP} -r ${WRKSRC}/package/doc/html ${STAGEDIR}${DOCSDIR}

-do-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${CP} -r ${WRKSRC}/gmn-examples/* ${STAGEDIR}${EXAMPLESDIR}
-
 .include <bsd.port.mk>
--- a/audio/guidolib/distinfo
+++ b/audio/guidolib/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1614055636
-SHA256 (grame-cncm-guidolib-v168_GH0.tar.gz) = ff4abd38b419e54a53f90522349e440c60c49cd1f8d17e73e9b4e0c78aa66070
-SIZE (grame-cncm-guidolib-v168_GH0.tar.gz) = 42637630
+TIMESTAMP = 1635175125
+SHA256 (grame-cncm-guidolib-1.7.1-v171_GH0.tar.gz) = b923f012055af06fa28eae0012cf593464ad65070ddd4d26733a3dcfa9f3a32d
+SIZE (grame-cncm-guidolib-1.7.1-v171_GH0.tar.gz) = 42459395
--- a/audio/guidolib/files/patch-build_CMakeLists.txt
+++ b/audio/guidolib/files/patch-build_CMakeLists.txt
@ -0,0 +1,20 @@
+--- build/CMakeLists.txt.orig	2021-10-25 09:44:31 UTC
+++ build/CMakeLists.txt
+@@ -256,7 +256,7 @@ else()
+ 	set (INSTALL_BIN 		${CMAKE_INSTALL_PREFIX}/bin)
+ 	set (INSTALL_LIB 		${CMAKE_INSTALL_PREFIX}/lib)
+ 	set (INSTALL_INC 		${CMAKE_INSTALL_PREFIX}/include/guido)
+-	set (INSTALL_SAMPLES 	${CMAKE_INSTALL_PREFIX}/share/guidolib/examples)
+	set (INSTALL_SAMPLES 	share/examples/guidolib)
+ 	set (INSTALL_APPS 		${CMAKE_INSTALL_PREFIX}/bin)
+ 	set (INSTALL_DOC 		${CMAKE_INSTALL_PREFIX}/share/guidolib/doc)
+ 	set (INSTALL_INTERFACES ${CMAKE_INSTALL_PREFIX}/share/guidolib)
+@@ -319,7 +319,7 @@ install (
+ 	DIRECTORY ${GMN} DESTINATION ${INSTALL_SAMPLES}
+ 	FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+ 	DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+-	FILES_MATCHING PATTERN "*.gmn"
+	#FILES_MATCHING PATTERN "*.gmn" # workaround for https://github.com/grame-cncm/guidolib/issues/130
+ 	PATTERN "SheetMusic" EXCLUDE
+ )
+ 
--- a/audio/guidolib/files/patch-build_Makefile
+++ b/audio/guidolib/files/patch-build_Makefile
@ -1,11 +0,0 @@
--- build/Makefile.orig	2021-02-23 05:12:20 UTC
-+++ build/Makefile
-@@ -39,7 +39,7 @@ basic : $(PROJ)
- all : $(PROJ)
- 	$(MAKE) basic
- 	$(MAKE) Qt
-	$(MAKE) wasm
-+	#$(MAKE) wasm
- 	
- $(PROJ) : $(BUILDDIR)
- 	cd $(BUILDDIR) && cmake $(CMAKEOPT) .. -G $(GENERATOR)
--- a/audio/guidolib/pkg-descr
+++ b/audio/guidolib/pkg-descr
@ -17,4 +17,4 @@ notation software, compositional and analytical systems and tools, performance
 systems, and large musical databases.  It is powerful, flexible, easily
 portable, and human readable.

-WWW: http://guidolib.sourceforge.net/
+WWW: https://guido.grame.fr/
--- a/audio/guidolib/pkg-plist
+++ b/audio/guidolib/pkg-plist
@ -1,12 +1,11 @@
-bin/GuidoEditor
-bin/GuidoSceneComposer
 bin/guido2abstract
-bin/guido2image
 bin/guido2midi
 bin/guido2proll
 bin/guido2rproportional
 bin/guido2svg
 bin/guido2svgmap
+bin/guidoar2gr
+bin/guidodraw
 bin/guidogetmeters
 bin/guidogetpagecount
 bin/guidogetpagemap
@ -17,6 +16,7 @@ bin/guidogettimemap
 bin/guidogetversion
 bin/guidogetvoicecount
 bin/guidogetvoicemap
+bin/guidoparse
 bin/midi2proll
 include/guido/CairoDevice.h
 include/guido/CairoFont.h
@ -43,16 +43,17 @@ include/guido/VGPen.h
 include/guido/VGSystem.h
 lib/libGUIDOEngine.so
 lib/libGUIDOEngine.so.1
-lib/libGUIDOEngine.so.1.6.8
-share/fonts/guido/guido2.ttf/guido2.svg
-share/fonts/guido/guido2.ttf/guido2.ttf
-%%DATADIR%%/doc/GUIDO-Format_de_Notation_Musicale.pdf
+lib/libGUIDOEngine.so.1.7.1
+share/fonts/guidolib/guido2.svg
+share/fonts/guidolib/guido2.ttf
+%%DATADIR%%/doc/GMNRefCard.pdf
 %%DATADIR%%/doc/GUIDO-Music-Notation-Format.pdf
 %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.3.8.pdf
 %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.5.1.pdf
 %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.5.2.pdf
 %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.5.4.pdf
-%%DATADIR%%/doc/classes.pdf
+%%DATADIR%%/doc/RefCardsParams.pdf
+%%DATADIR%%/doc/RefCardsTags.pdf
 %%DATADIR%%/doc/html/GUIDO-Music-Notation-Format.html
 %%DATADIR%%/doc/html/GUIDO_Additional_Specifications_1.3.8.html
 %%DATADIR%%/doc/html/GUIDO_Additional_Specifications_1.5.1.html
@ -97,152 +98,3 @@ share/fonts/guido/guido2.ttf/guido2.ttf
 %%DATADIR%%/doc/html/imgs/tuplet2.png
 %%DATADIR%%/doc/html/imgs/turn.jpg
 %%DATADIR%%/doc/readme.md
-%%DATADIR%%/gmn-examples/chord/chords.gmn
-%%DATADIR%%/gmn-examples/chord/chords1.gmn
-%%DATADIR%%/gmn-examples/chord/chords2.gmn
-%%DATADIR%%/gmn-examples/complex_files/846_2f.gmn
-%%DATADIR%%/gmn-examples/complex_files/Bach-BWV772.gmn
-%%DATADIR%%/gmn-examples/complex_files/Faure.gmn
-%%DATADIR%%/gmn-examples/complex_files/bach.gmn
-%%DATADIR%%/gmn-examples/complex_files/bach_2.gmn
-%%DATADIR%%/gmn-examples/complex_files/complexScore.gmn
-%%DATADIR%%/gmn-examples/complex_files/moz581.gmn
-%%DATADIR%%/gmn-examples/examples/4voices.gmn
-%%DATADIR%%/gmn-examples/examples/accidentals.gmn
-%%DATADIR%%/gmn-examples/examples/allthethings.gmn
-%%DATADIR%%/gmn-examples/examples/articulations.gmn
-%%DATADIR%%/gmn-examples/examples/bach.gmn
-%%DATADIR%%/gmn-examples/examples/barlines.gmn
-%%DATADIR%%/gmn-examples/examples/bartok.gmn
-%%DATADIR%%/gmn-examples/examples/beaming.gmn
-%%DATADIR%%/gmn-examples/examples/beethoven.gmn
-%%DATADIR%%/gmn-examples/examples/brown.gmn
-%%DATADIR%%/gmn-examples/examples/clefkeymeter.gmn
-%%DATADIR%%/gmn-examples/examples/cpebach.gmn
-%%DATADIR%%/gmn-examples/examples/dynamics.gmn
-%%DATADIR%%/gmn-examples/examples/faure.gmn
-%%DATADIR%%/gmn-examples/examples/layout.gmn
-%%DATADIR%%/gmn-examples/examples/lutkin.gmn
-%%DATADIR%%/gmn-examples/examples/mozart581.gmn
-%%DATADIR%%/gmn-examples/examples/notes.gmn
-%%DATADIR%%/gmn-examples/examples/ornaments.gmn
-%%DATADIR%%/gmn-examples/examples/repeats.gmn
-%%DATADIR%%/gmn-examples/examples/slurs.gmn
-%%DATADIR%%/gmn-examples/examples/space.gmn
-%%DATADIR%%/gmn-examples/examples/tempo.gmn
-%%DATADIR%%/gmn-examples/lyrics/bach_lyrics.gmn
-%%DATADIR%%/gmn-examples/lyrics/bach_lyrics_withlinebreaks.gmn
-%%DATADIR%%/gmn-examples/lyrics/lyrics.gmn
-%%DATADIR%%/gmn-examples/lyrics/lyrics_with_3_verse.gmn
-%%DATADIR%%/gmn-examples/misc/4voices.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.38/fermatas.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.38/harmonic.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.38/pizz.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.38/staccato.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.43/cautionary.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.43/quarters.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.47/freekey.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/cluster.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/combinedBeams.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/featheredBeam.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/featheredBeamComplex.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/featheredBeamNewSystem.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/glissando.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/noteFormat2.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/noteFormat3.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/staffOffOn.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/staffOffOn_complex.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.51/symbol.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/accolade.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/complexMeter.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/newBarsBehaviour.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/newCrescDecrescAttributes.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/newMarcatoAttribute.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/newStaffFormatAttribute.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.52/newTupletAttributes.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.53/autoMeasuresOn.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.54/measuresNumbering.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.54/newStaffFormatAttribute.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.54/staffdistance.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.54/tremolo.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.57/newTupletParam.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/accidental.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/barformat.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/lyrics-ypos.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/mark.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/measuresNumberingPage.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/ties.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.63/tuplets.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/accelerandoRitardando.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/complexMeter.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/dynamics.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/fixed-staff-distance.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/grace-beaming.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/harmony.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/instr.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/lyrics-ypos.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/measureNumberingSkipped.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/measureNumberingSystem.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/measureNumberingSystem2.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.64/slursdy.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/mordent.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/trill-tie-repeat.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/trill.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/trillAndTies.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/trillLine.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.65/turn.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.66/arpeggio.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.66/fingering-misc.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.66/fingering.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.66/intens.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.66/pedal.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.67/intens.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.68/bowing.gmn
-%%DATADIR%%/gmn-examples/new-tags-v1.68/chords-fingering.gmn
-%%DATADIR%%/gmn-examples/note/headsReverse.gmn
-%%DATADIR%%/gmn-examples/note/noteFormat.gmn
-%%DATADIR%%/gmn-examples/note/sample.gmn
-%%DATADIR%%/gmn-examples/tags/acc.gmn
-%%DATADIR%%/gmn-examples/tags/autoBreak.gmn
-%%DATADIR%%/gmn-examples/tags/barFormat.gmn
-%%DATADIR%%/gmn-examples/tags/barformat2.gmn
-%%DATADIR%%/gmn-examples/tags/beam.gmn
-%%DATADIR%%/gmn-examples/tags/beams.gmn
-%%DATADIR%%/gmn-examples/tags/beamsfull.gmn
-%%DATADIR%%/gmn-examples/tags/begend.gmn
-%%DATADIR%%/gmn-examples/tags/centerrests.gmn
-%%DATADIR%%/gmn-examples/tags/clef.gmn
-%%DATADIR%%/gmn-examples/tags/cue.gmn
-%%DATADIR%%/gmn-examples/tags/dim.gmn
-%%DATADIR%%/gmn-examples/tags/dotFormat.gmn
-%%DATADIR%%/gmn-examples/tags/dots.gmn
-%%DATADIR%%/gmn-examples/tags/empty.gmn
-%%DATADIR%%/gmn-examples/tags/fermata.gmn
-%%DATADIR%%/gmn-examples/tags/fingering.gmn
-%%DATADIR%%/gmn-examples/tags/grace.gmn
-%%DATADIR%%/gmn-examples/tags/instr.gmn
-%%DATADIR%%/gmn-examples/tags/intens.gmn
-%%DATADIR%%/gmn-examples/tags/key.gmn
-%%DATADIR%%/gmn-examples/tags/marcato.gmn
-%%DATADIR%%/gmn-examples/tags/meter.gmn
-%%DATADIR%%/gmn-examples/tags/newSystem.gmn
-%%DATADIR%%/gmn-examples/tags/pageFormat.gmn
-%%DATADIR%%/gmn-examples/tags/restFormat.gmn
-%%DATADIR%%/gmn-examples/tags/slur.gmn
-%%DATADIR%%/gmn-examples/tags/space.gmn
-%%DATADIR%%/gmn-examples/tags/special-articulations.gmn
-%%DATADIR%%/gmn-examples/tags/staff.gmn
-%%DATADIR%%/gmn-examples/tags/staff2.gmn
-%%DATADIR%%/gmn-examples/tags/staffFormat.gmn
-%%DATADIR%%/gmn-examples/tags/stems.gmn
-%%DATADIR%%/gmn-examples/tags/stemsAuto.gmn
-%%DATADIR%%/gmn-examples/tags/systemFormat.gmn
-%%DATADIR%%/gmn-examples/tags/tempo.gmn
-%%DATADIR%%/gmn-examples/tags/testsysstretch.gmn
-%%DATADIR%%/gmn-examples/tags/text.gmn
-%%DATADIR%%/gmn-examples/tags/tie.gmn
-%%DATADIR%%/gmn-examples/tags/ties-up-down.gmn
-%%DATADIR%%/gmn-examples/tags/title.gmn
-%%DATADIR%%/gmn-examples/tags/tuplet.gmn
-%%DATADIR%%/gmn-examples/tags/volta.gmn
-@dir %%DATADIR%%/gmn-examples/new-tags-v1.51/symbols
--- a/audio/inscore/Makefile
+++ b/audio/inscore/Makefile
@ -0,0 +1,35 @@
+PORTNAME=	inscore
+PORTVERSION=	1.28
+CATEGORIES=	audio
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Environment for the design of interactive augmented music scores
+
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/src/license.txt
+
+LIB_DEPENDS=	libGUIDOEngine.so:audio/guidolib \
+		libguidoar.so:audio/guidoar \
+		libmicrohttpd.so:www/libmicrohttpd
+
+USES=		cmake gnome qt:5
+USE_QT=		core declarative gui network multimedia opengl printsupport sensors svg widgets websockets \
+		qmake_build buildtools_build
+USE_LDCONFIG=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	grame-cncm
+GH_TAGNAME=	v${PORTVERSION:S/.//}
+GH_TUPLE=	grame-cncm:guidolib:3cf3d88:guidolib/modules/guidolib # this uses some un-installed parts of the guidolib project, partucularly QGuidoPainter.h
+
+CMAKE_SOURCE_PATH=	${WRKSRC}/build
+
+CXXFLAGS+=	-I${LOCALBASE}/include/guido -I${LOCALBASE}/include/guidoar
+
+OPTIONS_DEFINE=		DOCS EXAMPLES
+OPTIONS_DEFAULT=	DOCS EXAMPLES
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+.include <bsd.port.mk>
--- a/audio/inscore/distinfo
+++ b/audio/inscore/distinfo
@ -0,0 +1,5 @@
+TIMESTAMP = 1635099044
+SHA256 (grame-cncm-inscore-1.28-v128_GH0.tar.gz) = f280d9057d59b140f8d567f9e8ac0ecdd811e2964475a817eb1a54f15d493d8b
+SIZE (grame-cncm-inscore-1.28-v128_GH0.tar.gz) = 443524698
+SHA256 (grame-cncm-guidolib-3cf3d88_GH0.tar.gz) = 0ec8a9e60d76230e69de9e0263b04ffe93d4f2fa660856e2666863cd99f6bea4
+SIZE (grame-cncm-guidolib-3cf3d88_GH0.tar.gz) = 42458506
--- a/audio/inscore/files/patch-build_CMakeLists.txt
+++ b/audio/inscore/files/patch-build_CMakeLists.txt
@ -0,0 +1,13 @@
+--- build/CMakeLists.txt.orig	2021-10-24 18:32:31 UTC
+++ build/CMakeLists.txt
+@@ -378,8 +378,8 @@ else()
+ 	set (INSTALL_BIN 		${CMAKE_INSTALL_PREFIX}/bin)
+ 	set (INSTALL_LIB 		${CMAKE_INSTALL_PREFIX}/lib)
+ 	set (INSTALL_INC 		${CMAKE_INSTALL_PREFIX}/include/inscore)
+-	set (INSTALL_SAMPLES 	${CMAKE_INSTALL_PREFIX}/share/inscore/examples)
+-	set (INSTALL_GMN_SAMPLES 	${CMAKE_INSTALL_PREFIX}/share/inscore/GMN-Examples)
+	set (INSTALL_SAMPLES 	share/examples/inscore)
+	set (INSTALL_GMN_SAMPLES 	share/examples/inscore)
+ 	set (INSTALL_BUNDLES 	${CMAKE_INSTALL_PREFIX}/share/inscore/bundles)
+ 	set (INSTALL_TOOLS 		${CMAKE_INSTALL_PREFIX}/share/inscore/tools)
+ 	set (INSTALL_INTERFACES 	${CMAKE_INSTALL_PREFIX}/share/inscore)
--- a/audio/inscore/files/patch-build_Makefile
+++ b/audio/inscore/files/patch-build_Makefile
@ -0,0 +1,11 @@
+--- build/Makefile.orig	2021-02-23 07:13:54 UTC
+++ build/Makefile
+@@ -38,7 +38,7 @@ endif
+ GENERATOR ?= 
+ 
+ all :
+-	$(MAKE) modules
+	#$(MAKE) modules
+ 	$(MAKE) inscore
+ 
+ test:
--- a/audio/inscore/files/patch-build_modules_GUIDOConfig.cmake
+++ b/audio/inscore/files/patch-build_modules_GUIDOConfig.cmake
@ -0,0 +1,15 @@
+--- build/modules/GUIDOConfig.cmake.orig	2021-05-09 16:41:13 UTC
+++ build/modules/GUIDOConfig.cmake
+@@ -21,9 +21,9 @@ elseif(WIN32)
+ 		set (GUIDO_DLL ${GUIDOLIB}/build/lib/GUIDOEngine.dll)
+ 	endif()		
+ else()
+-	set (GUIDO_LIBRARIES -L${CMAKE_CURRENT_SOURCE_DIR}/lib -lGUIDOEngine)
+	set (GUIDO_LIBRARIES -lGUIDOEngine)
+ endif()
+ 
+-file (STRINGS "${GUIDOLIB}/version.txt" GUIDO_VERSION)
+-message (STATUS "Using GUIDOEngine version ${GUIDO_VERSION}")
+#file (STRINGS "${GUIDOLIB}/version.txt" GUIDO_VERSION)
+message (STATUS "Using GUIDOEngine")
+ 
--- a/audio/inscore/files/patch-src_inscore_model_Modules.h
+++ b/audio/inscore/files/patch-src_inscore_model_Modules.h
@ -0,0 +1,11 @@
+--- src/inscore/model/Modules.h.orig	2021-02-23 07:27:14 UTC
+++ src/inscore/model/Modules.h
+@@ -56,7 +56,7 @@
+ 
+ #if QTView
+ # define INCLUDEFaustWeb		false
+-# define HASQGuidoImporter		true
+# define HASQGuidoImporter		false
+ # define HASFileDownloader		true
+ # define HASWSSupport			true
+ # define HASHTTPSupport			true
--- a/audio/inscore/pkg-descr
+++ b/audio/inscore/pkg-descr
@ -0,0 +1,7 @@
+INScore is an environment for the design of interactive augmented music scores.
+It extends the music representation to arbitrary graphic objects, including
+symbolic music notation. It provides time synchronization in the graphic space,
+signals graphic representations, interaction processes representation, dynamic
+and interactive scores. It supports Web and local network extensions.
+
+WWW: https://inscore.grame.fr/
--- a/audio/inscore/pkg-message
+++ b/audio/inscore/pkg-message
@ -0,0 +1,25 @@
+[
+{ type: install
+  message: <<EOM
+You installed INScore, the environment for the design of interactive
+augmented music scores.
+
+INScore works based on OSC (Open Sound Control) signals in the form of
+network packets (by default on the port 7000), or in the form of
+.inscore programs.
+
+INScore understands .inscore syntax, which is OSC format amended with
+commands for general purpose programming, which makes it a programming
+language.
+
+OSC signals are expected to be sent through the network by some of
+numerous programs supporting this standard.
+
+The main executable, inscoreviewer, opens the window, listens to the
+port 7000, and also expects .inscore files to be dropped into its
+window.
+
+Please use .inscore files in examples to see what INScore can do.
+EOM
+}
+]
--- a/audio/inscore/pkg-plist
+++ b/audio/inscore/pkg-plist
@ -0,0 +1,107 @@
+bin/IBundle
+bin/INScoreViewer
+include/inscore/IExport.h
+include/inscore/INScore.h
+include/inscore/message.h
+lib/libINScore.so
+lib/libINScore.so.1
+lib/libINScore.so.1.2.8
+share/fonts/inscore/Carlito-Regular.ttf
+share/fonts/inscore/guido2.ttf
+%%DATADIR%%/doc/Guido/GMNRefCard.pdf
+%%DATADIR%%/doc/Guido/GUIDO-Music-Notation-Format.pdf
+%%DATADIR%%/doc/Guido/RefCardsParams.pdf
+%%DATADIR%%/doc/Guido/RefCardsTags.pdf
+%%DATADIR%%/doc/Guido/readme.txt
+%%DATADIR%%/doc/INScore-refcard-1.12.pdf
+%%DATADIR%%/doc/INScoreLang.pdf
+%%DATADIR%%/interfaces/Csound/CsoundCommandline/01Hello.csd
+%%DATADIR%%/interfaces/Csound/CsoundCommandline/02Receive.csd
+%%DATADIR%%/interfaces/Csound/CsoundCommandline/03Demo.csd
+%%DATADIR%%/interfaces/Csound/CsoundCommandline/06Tables.csd
+%%DATADIR%%/interfaces/Csound/CsoundCommandline/08SoundImage.csd
+%%DATADIR%%/interfaces/Csound/CsoundQt/01Hello.csd
+%%DATADIR%%/interfaces/Csound/CsoundQt/02Receive.csd
+%%DATADIR%%/interfaces/Csound/CsoundQt/03Demo.csd
+%%DATADIR%%/interfaces/Csound/CsoundQt/04Sinus.csd
+%%DATADIR%%/interfaces/Csound/CsoundQt/05ShowAndTransform.csd
+%%DATADIR%%/interfaces/Csound/CsoundQt/06Tables.csd
+%%DATADIR%%/interfaces/Csound/CsoundQt/07TablesInteraction.csd
+%%DATADIR%%/interfaces/Csound/CsoundQt/08SoundImage.csd
+%%DATADIR%%/interfaces/Csound/CsoundQt/sinus.inscore
+%%DATADIR%%/interfaces/Csound/GetError.inscore
+%%DATADIR%%/interfaces/Csound/GetPorts.inscore
+%%DATADIR%%/interfaces/Csound/Readme.txt
+%%DATADIR%%/interfaces/Csound/rsrc/1voice-846_2f.gmn
+%%DATADIR%%/interfaces/Csound/rsrc/anr.gif
+%%DATADIR%%/interfaces/Csound/rsrc/boucou.gif
+%%DATADIR%%/interfaces/Csound/rsrc/car_blue.gif
+%%DATADIR%%/interfaces/Csound/rsrc/car_red.gif
+%%DATADIR%%/interfaces/Csound/rsrc/csconf.jpg
+%%DATADIR%%/interfaces/Csound/rsrc/demo.osc
+%%DATADIR%%/interfaces/Csound/rsrc/grame.png
+%%DATADIR%%/interfaces/Csound/rsrc/interlude.html
+%%DATADIR%%/interfaces/Csound/rsrc/parm-oeil.jpg
+%%DATADIR%%/interfaces/Csound/rsrc/parm-oeil.map
+%%DATADIR%%/interfaces/Csound/rsrc/syncomment1.html
+%%DATADIR%%/interfaces/Csound/rsrc/syncomment2.html
+%%DATADIR%%/interfaces/Csound/rsrc/syncomment3.html
+%%DATADIR%%/interfaces/Csound/rsrc/syncomment4.html
+%%DATADIR%%/interfaces/Csound/rsrc/syncomment5.html
+%%DATADIR%%/interfaces/Csound/rsrc/syncomment6.map
+%%DATADIR%%/interfaces/Csound/rsrc/syncomment6.txt
+%%DATADIR%%/interfaces/Csound/rsrc/syncomment7.map
+%%DATADIR%%/interfaces/Csound/rsrc/syncomment7.txt
+%%DATADIR%%/interfaces/Csound/rsrc/syncomment8.txt
+%%DATADIR%%/interfaces/Csound/rsrc/title.html
+%%DATADIR%%/interfaces/Csound/strays.inc
+%%DATADIR%%/interfaces/lisp/ITL.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/asdf/asdf.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/.svnignore
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/ChangeLog
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/LICENSE
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/README
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/TODO
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/class.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/condition.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/defsys.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/interface.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/lispworks-udp.asd
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/lispworks-udp.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/load.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/multicast.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/package.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/rtt-client.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/rtt.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/test.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/udp-client.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/udp-server.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/unix-server.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/unix.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/lispworks-udp/wait-for-input.lisp
+%%DATADIR%%/interfaces/lisp/Lispworks/oscoverudp.lisp
+%%DATADIR%%/interfaces/lisp/example.lisp
+%%DATADIR%%/interfaces/lisp/osc/LGPL.txt
+%%DATADIR%%/interfaces/lisp/osc/LICENCE.txt
+%%DATADIR%%/interfaces/lisp/osc/README.txt
+%%DATADIR%%/interfaces/lisp/osc/osc-dispatch.lisp
+%%DATADIR%%/interfaces/lisp/osc/osc-examples.lisp
+%%DATADIR%%/interfaces/lisp/osc/osc.asd
+%%DATADIR%%/interfaces/lisp/osc/osc.lisp
+%%DATADIR%%/interfaces/lisp/readme.txt
+%%DATADIR%%/interfaces/lisp/rsrc/1voice-846_2f.gmn
+%%DATADIR%%/interfaces/lisp/rsrc/car_blue.gif
+%%DATADIR%%/interfaces/lisp/rsrc/car_red.gif
+%%DATADIR%%/interfaces/lisp/sync.inscore
+%%DATADIR%%/interfaces/python/ITL.py
+%%DATADIR%%/interfaces/python/example.py
+%%DATADIR%%/interfaces/python/pyOSC-0.3.5b-5294.tar.gz
+%%DATADIR%%/interfaces/python/readme.txt
+%%DATADIR%%/interfaces/python/rsrc/1voice-846_2f.gmn
+%%DATADIR%%/interfaces/python/rsrc/car_blue.gif
+%%DATADIR%%/interfaces/python/rsrc/car_red.gif
+%%DATADIR%%/interfaces/python/sync.inscore
+%%DATADIR%%/tools/drawmap/DROPME.inscore
+%%DATADIR%%/tools/drawmap/README.html
+%%DATADIR%%/tools/drawmap/README.md
+%%DATADIR%%/tools/drawmap/score.jpg
--- a/audio/lewton/Makefile
+++ b/audio/lewton/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	lewton
 DISTVERSION=	0.10.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio

 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
--- a/audio/libamrnb/Makefile
+++ b/audio/libamrnb/Makefile
@ -1,13 +1,13 @@
 # Created by: Tatsuki Makino <tatsuki_makino@hotmail.com>

 PORTNAME=	libamrnb
-PORTVERSION=	11.0.0.0
-PORTREVISION=	1
+DISTVERSION=	11.0.0.0
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.penguin.cz/~utx/ftp/amr/ \
-		http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/:SRC26104
-DISTNAME=	amrnb-${DISTVERSION}
+		https://www.3gpp.org/ftp/Specs/archive/26_series/26.104/:SRC26104
+DISTNAME=	amrnb-${DISTVERSIONFULL}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SRC26104}:SRC26104
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@ -20,15 +20,15 @@ LICENSE_COMB=	multi
 LICENSE_NAME_3GPP=	3GPP
 LICENSE_TEXT_3GPP=	unclear legal status, probably need licenses from 3GPP and more
 LICENSE_PERMS_3GPP=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
-LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_DISTFILES_3GPP=	${SRC26104}
+LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME}${EXTRACT_SUFX}

-USES=		gmake tar:bzip2 libtool
+USES=		autoreconf gmake tar:bzip2 libtool
+USE_LDCONFIG=	yes
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-message
-USE_LDCONFIG=	yes

 OPTIONS_DEFINE=	DOCS

--- a/audio/libamrnb/distinfo
+++ b/audio/libamrnb/distinfo
@ -1,3 +1,4 @@
+TIMESTAMP = 1632279600
 SHA256 (libamrnb/amrnb-11.0.0.0.tar.bz2) = 3890004b665278b963ecaae2dc1321dcee29c53ea9d91aaf18d9286105e0f1e1
 SIZE (libamrnb/amrnb-11.0.0.0.tar.bz2) = 244917
 SHA256 (libamrnb/26104-b00.zip) = 23df8b24b0f009783027b8eef5fa8225ec71f859f2704bdb06829f09018cc8f1
--- a/audio/libamrnb/pkg-descr
+++ b/audio/libamrnb/pkg-descr
@ -3,7 +3,7 @@
 3GPP released reference implementation of 3GPP Adaptive Multi-Rate
 Floating-point (AMR) Speech Codec (3GPP TS 26.104).

-http://www.3gpp.org/ftp/Specs/html-info/26104.htm
+https://www.3gpp.org/ftp/Specs/html-info/26104.htm

 This package converts 3GPP TS 26.104 reference implementation of AMR-NB to a
 shared library.
--- a/audio/libamrwb/Makefile
+++ b/audio/libamrwb/Makefile
@ -1,12 +1,12 @@
 # Created by: Tatsuki Makino <tatsuki_makino@hotmail.com>

 PORTNAME=	libamrwb
-PORTVERSION=	11.0.0.0
-PORTREVISION=	2
+DISTVERSION=	11.0.0.0
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.penguin.cz/~utx/ftp/amr/ \
-		http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/:SRC26204
-DISTNAME=	amrwb-${DISTVERSION}
+		https://www.3gpp.org/ftp/Specs/archive/26_series/26.204/:SRC26204
+DISTNAME=	amrwb-${DISTVERSIONFULL}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SRC26204}:SRC26204
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@ -19,15 +19,15 @@ LICENSE_COMB=	multi
 LICENSE_NAME_3GPP=	3GPP
 LICENSE_TEXT_3GPP=	unclear legal status, probably need licenses from 3GPP and more
 LICENSE_PERMS_3GPP=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
-LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_DISTFILES_3GPP=	${SRC26204}
+LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME}${EXTRACT_SUFX}

-USES=		gmake tar:bzip2 libtool
+USES=		autoreconf gmake tar:bzip2 libtool
+USE_LDCONFIG=	yes
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO readme.txt
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-message
-USE_LDCONFIG=	yes

 OPTIONS_DEFINE=	DOCS

--- a/audio/libamrwb/distinfo
+++ b/audio/libamrwb/distinfo
@ -1,3 +1,4 @@
+TIMESTAMP = 1632279600
 SHA256 (libamrwb/amrwb-11.0.0.0.tar.bz2) = 5caf59b14480b0cd2a7babb8be472c4af39ff4c7c95f1278116557049a4dd5dc
 SIZE (libamrwb/amrwb-11.0.0.0.tar.bz2) = 240170
 SHA256 (libamrwb/26204-b00.zip) = c885c44483fd4502d354ec9656f2cdc0469050015052f8f3ecc1d5e08c869fec
--- a/audio/libamrwb/pkg-descr
+++ b/audio/libamrwb/pkg-descr
@ -3,7 +3,7 @@
 3GPP released reference implementation of 3GPP AMR Adaptive Multi-Rate -
 Wideband (AMR-WB) Speech Codec (3GPP TS 26.204).

-http://www.3gpp.org/ftp/Specs/html-info/26204.htm
+https://www.3gpp.org/ftp/Specs/html-info/26204.htm

 This package converts 3GPP TS 26.204 reference implementation of AMR-WB to a
 shared library.
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@ -17,7 +17,9 @@ LIB_DEPENDS=	libFLAC.so:audio/flac

 CONFLICTS=	osalp-0.7.*

-USES=		pathfix pkgconfig tar:xz libtool
+USES=		cpe pathfix pkgconfig tar:xz libtool
+CPE_PRODUCT=	audiofile
+
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes

--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@ -13,7 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

 ONLY_FOR_ARCHS=	amd64 i386
-ONLY_FOR_ARCHS_REASON=	"not yet ported"
+ONLY_FOR_ARCHS_REASON=	not yet ported to this architecture

 BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		dssi>0:audio/dssi
--- a/audio/myxer/Makefile
+++ b/audio/myxer/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	myxer
 DISTVERSION=	1.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/ncspot/Makefile
+++ b/audio/ncspot/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	ncspot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio

 MAINTAINER=	rodrigo@FreeBSD.org
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	openal-soft
 PORTVERSION=	1.21.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://openal-soft.org/openal-releases/

--- a/audio/openal-soft/files/patch-alc_backends_sndio.cpp
+++ b/audio/openal-soft/files/patch-alc_backends_sndio.cpp
@ -0,0 +1,455 @@
+--- alc/backends/sndio.cpp.orig	2021-02-04 19:09:06 UTC
+++ alc/backends/sndio.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include "backends/sndio.h"
+ 
+#include <poll.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -43,7 +44,12 @@ namespace {
+ 
+ static const char sndio_device[] = "SndIO Default";
+ 
+struct SioPar : public sio_par {
+    SioPar() { sio_initpar(this); }
+ 
+    void clear() { sio_initpar(this); }
+};
+
+ struct SndioPlayback final : public BackendBase {
+     SndioPlayback(ALCdevice *device) noexcept : BackendBase{device} { }
+     ~SndioPlayback() override;
+@@ -56,6 +62,7 @@ struct SndioPlayback final : public BackendBase {
+     void stop() override;
+ 
+     sio_hdl *mSndHandle{nullptr};
+    uint mFrameStep{};
+ 
+     al::vector<al::byte> mBuffer;
+ 
+@@ -74,39 +81,29 @@ SndioPlayback::~SndioPlayback()
+ 
+ int SndioPlayback::mixerProc()
+ {
+-    sio_par par;
+-    sio_initpar(&par);
+-    if(!sio_getpar(mSndHandle, &par))
+-    {
+-        mDevice->handleDisconnect("Failed to get device parameters");
+-        return 1;
+-    }
+    const size_t frameStep{mFrameStep};
+    const size_t frameSize{frameStep * mDevice->bytesFromFmt()};
+ 
+-    const size_t frameStep{par.pchan};
+-    const size_t frameSize{frameStep * par.bps};
+-
+     SetRTPriority();
+     althrd_setname(MIXER_THREAD_NAME);
+ 
+     while(!mKillNow.load(std::memory_order_acquire)
+         && mDevice->Connected.load(std::memory_order_acquire))
+     {
+-        al::byte *WritePtr{mBuffer.data()};
+-        size_t len{mBuffer.size()};
+        al::span<al::byte> buffer{mBuffer};
+ 
+-        mDevice->renderSamples(WritePtr, static_cast<uint>(len/frameSize), frameStep);
+-        while(len > 0 && !mKillNow.load(std::memory_order_acquire))
+        mDevice->renderSamples(buffer.data(), static_cast<uint>(buffer.size() / frameSize),
+            frameStep);
+        while(!buffer.empty() && !mKillNow.load(std::memory_order_acquire))
+         {
+-            size_t wrote{sio_write(mSndHandle, WritePtr, len)};
+            size_t wrote{sio_write(mSndHandle, buffer.data(), buffer.size())};
+             if(wrote == 0)
+             {
+                 ERR("sio_write failed\n");
+                 mDevice->handleDisconnect("Failed to write playback samples");
+                 break;
+             }
+-
+-            len -= wrote;
+-            WritePtr += wrote;
+            buffer = buffer.subspan(wrote);
+         }
+     }
+ 
+@@ -131,26 +128,12 @@ void SndioPlayback::open(const char *name)
+ 
+ bool SndioPlayback::reset()
+ {
+-    sio_par par;
+-    sio_initpar(&par);
+    SioPar par;
+ 
+-    par.rate = mDevice->Frequency;
+-    switch(mDevice->FmtChans)
+    auto tryfmt = mDevice->FmtType;
+retry_params:
+    switch(tryfmt)
+     {
+-    case DevFmtMono   : par.pchan = 1; break;
+-    case DevFmtQuad   : par.pchan = 4; break;
+-    case DevFmtX51Rear: // fall-through - "Similar to 5.1, except using rear channels instead of sides"
+-    case DevFmtX51    : par.pchan = 6; break;
+-    case DevFmtX61    : par.pchan = 7; break;
+-    case DevFmtX71    : par.pchan = 8; break;
+-
+-    // fall back to stereo for Ambi3D
+-    case DevFmtAmbi3D : // fall-through
+-    case DevFmtStereo : par.pchan = 2; break;
+-    }
+-
+-    switch(mDevice->FmtType)
+-    {
+     case DevFmtByte:
+         par.bits = 8;
+         par.sig = 1;
+@@ -159,7 +142,6 @@ bool SndioPlayback::reset()
+         par.bits = 8;
+         par.sig = 0;
+         break;
+-    case DevFmtFloat:
+     case DevFmtShort:
+         par.bits = 16;
+         par.sig = 1;
+@@ -168,6 +150,7 @@ bool SndioPlayback::reset()
+         par.bits = 16;
+         par.sig = 0;
+         break;
+    case DevFmtFloat:
+     case DevFmtInt:
+         par.bits = 32;
+         par.sig = 1;
+@@ -177,70 +160,64 @@ bool SndioPlayback::reset()
+         par.sig = 0;
+         break;
+     }
+    par.bps = SIO_BPS(par.bits);
+     par.le = SIO_LE_NATIVE;
+    par.msb = 1;
+ 
+    par.rate = mDevice->Frequency;
+    par.pchan = mDevice->channelsFromFmt();
+
+     par.round = mDevice->UpdateSize;
+     par.appbufsz = mDevice->BufferSize - mDevice->UpdateSize;
+     if(!par.appbufsz) par.appbufsz = mDevice->UpdateSize;
+ 
+-    if(!sio_setpar(mSndHandle, &par) || !sio_getpar(mSndHandle, &par))
+-    {
+-        ERR("Failed to set device parameters\n");
+-        return false;
+-    }
+    try {
+        if(!sio_setpar(mSndHandle, &par))
+            throw al::backend_exception{al::backend_error::DeviceError,
+                "Failed to set device parameters"};
+ 
+-    if(par.bits != par.bps*8)
+-    {
+-        ERR("Padded samples not supported (%u of %u bits)\n", par.bits, par.bps*8);
+-        return false;
+-    }
+-    if(par.le != SIO_LE_NATIVE)
+-    {
+-        ERR("Non-native-endian samples not supported (got %s-endian)\n",
+-            par.le ? "little" : "big");
+-        return false;
+-    }
+        par.clear();
+        if(!sio_getpar(mSndHandle, &par))
+            throw al::backend_exception{al::backend_error::DeviceError,
+                "Failed to get device parameters"};
+ 
+-    mDevice->Frequency = par.rate;
+-
+-    if(par.pchan < 2)
+-    {
+-        if(mDevice->FmtChans != DevFmtMono)
+-        {
+-            WARN("Got %u channel for %s\n", par.pchan, DevFmtChannelsString(mDevice->FmtChans));
+-            mDevice->FmtChans = DevFmtMono;
+-        }
+        if(par.bps > 1 && par.le != SIO_LE_NATIVE)
+            throw al::backend_exception{al::backend_error::DeviceError,
+                "%s-endian samples not supported", par.le ? "Little" : "Big"};
+        if(par.bits < par.bps*8 && !par.msb)
+            throw al::backend_exception{al::backend_error::DeviceError,
+                "MSB-padded samples not supported (%u of %u bits)", par.bits, par.bps*8};
+        if(par.pchan < 1)
+            throw al::backend_exception{al::backend_error::DeviceError,
+                "No playback channels on device"};
+     }
+-    else if((par.pchan == 2 && mDevice->FmtChans != DevFmtStereo)
+-        || par.pchan == 3
+-        || (par.pchan == 4 && mDevice->FmtChans != DevFmtQuad)
+-        || par.pchan == 5
+-        || (par.pchan == 6 && mDevice->FmtChans != DevFmtX51 && mDevice->FmtChans != DevFmtX51Rear)
+-        || (par.pchan == 7 && mDevice->FmtChans != DevFmtX61)
+-        || (par.pchan == 8 && mDevice->FmtChans != DevFmtX71)
+-        || par.pchan > 8)
+-    {
+-        WARN("Got %u channels for %s\n", par.pchan, DevFmtChannelsString(mDevice->FmtChans));
+-        mDevice->FmtChans = DevFmtStereo;
+    catch(al::backend_exception &e) {
+        if(tryfmt == DevFmtShort)
+            throw;
+        par.clear();
+        tryfmt = DevFmtShort;
+        goto retry_params;
+     }
+ 
+-    if(par.bits == 8 && par.sig == 1)
+-        mDevice->FmtType = DevFmtByte;
+-    else if(par.bits == 8 && par.sig == 0)
+-        mDevice->FmtType = DevFmtUByte;
+-    else if(par.bits == 16 && par.sig == 1)
+-        mDevice->FmtType = DevFmtShort;
+-    else if(par.bits == 16 && par.sig == 0)
+-        mDevice->FmtType = DevFmtUShort;
+-    else if(par.bits == 32 && par.sig == 1)
+-        mDevice->FmtType = DevFmtInt;
+-    else if(par.bits == 32 && par.sig == 0)
+-        mDevice->FmtType = DevFmtUInt;
+    if(par.bps == 1)
+        mDevice->FmtType = (par.sig==1) ? DevFmtByte : DevFmtUByte;
+    else if(par.bps == 2)
+        mDevice->FmtType = (par.sig==1) ? DevFmtShort : DevFmtUShort;
+    else if(par.bps == 4)
+        mDevice->FmtType = (par.sig==1) ? DevFmtInt : DevFmtUInt;
+     else
+        throw al::backend_exception{al::backend_error::DeviceError,
+            "Unhandled sample format: %s %u-bit", (par.sig?"signed":"unsigned"), par.bps*8};
+
+    mFrameStep = par.pchan;
+    if(par.pchan != mDevice->channelsFromFmt())
+     {
+-        ERR("Unhandled sample format: %s %u-bit\n", (par.sig?"signed":"unsigned"), par.bits);
+-        return false;
+        WARN("Got %u channel%s for %s\n", par.pchan, (par.pchan==1)?"":"s",
+            DevFmtChannelsString(mDevice->FmtChans));
+        if(par.pchan < 2) mDevice->FmtChans = DevFmtMono;
+        else mDevice->FmtChans = DevFmtStereo;
+     }
+    mDevice->Frequency = par.rate;
+ 
+     setDefaultChannelOrder();
+ 
+@@ -287,6 +264,11 @@ void SndioPlayback::stop()
+ }
+ 
+ 
+/* TODO: This could be improved by avoiding the ring buffer and record thread,
+ * counting the available samples with the sio_onmove callback and reading
+ * directly from the device. However, this depends on reasonable support for
+ * capture buffer sizes apps may request.
+ */
+ struct SndioCapture final : public BackendBase {
+     SndioCapture(ALCdevice *device) noexcept : BackendBase{device} { }
+     ~SndioCapture() override;
+@@ -301,6 +283,7 @@ struct SndioCapture final : public BackendBase {
+ 
+     sio_hdl *mSndHandle{nullptr};
+ 
+    al::vector<struct pollfd> mFds;
+     RingBufferPtr mRing;
+ 
+     std::atomic<bool> mKillNow{true};
+@@ -323,40 +306,65 @@ int SndioCapture::recordProc()
+ 
+     const uint frameSize{mDevice->frameSizeFromFmt()};
+ 
+    int nfds_pre{sio_nfds(mSndHandle)};
+    if (nfds_pre <= 0)
+    {
+        mDevice->handleDisconnect("Incorrect return value from sio_nfds(): %d", nfds_pre);
+        return 1;
+    }
+
+    mFds.resize(nfds_pre);
+
+     while(!mKillNow.load(std::memory_order_acquire)
+         && mDevice->Connected.load(std::memory_order_acquire))
+     {
+-        auto data = mRing->getWriteVector();
+-        size_t todo{data.first.len + data.second.len};
+-        if(todo == 0)
+        /* Wait until there's some samples to read. */
+        const int nfds{sio_pollfd(mSndHandle, mFds.data(), POLLIN)};
+        if(nfds <= 0)
+         {
+-            static char junk[4096];
+-            sio_read(mSndHandle, junk,
+-                minz(sizeof(junk)/frameSize, mDevice->UpdateSize)*frameSize);
+            mDevice->handleDisconnect("Failed to get polling fds: %d", nfds);
+            break;
+        }
+        int pollres{::poll(mFds.data(), static_cast<uint>(nfds), 2000)};
+        if(pollres < 0)
+        {
+            if(errno == EINTR) continue;
+            mDevice->handleDisconnect("Poll error: %s", strerror(errno));
+            break;
+        }
+        if(pollres == 0)
+             continue;
+
+        const int revents{sio_revents(mSndHandle, mFds.data())};
+        if((revents&POLLHUP))
+        {
+            mDevice->handleDisconnect("Got POLLHUP from poll events");
+            break;
+         }
+        if(!(revents&POLLIN))
+            continue;
+ 
+-        size_t total{0u};
+-        data.first.len  *= frameSize;
+-        data.second.len *= frameSize;
+-        todo = minz(todo, mDevice->UpdateSize) * frameSize;
+-        while(total < todo)
+        auto data = mRing->getWriteVector();
+        al::span<al::byte> buffer{data.first.buf, data.first.len*frameSize};
+        while(!buffer.empty())
+         {
+-            if(!data.first.len)
+-                data.first = data.second;
+            size_t got{sio_read(mSndHandle, buffer.data(), buffer.size())};
+            if(got == 0) break;
+ 
+-            size_t got{sio_read(mSndHandle, data.first.buf, minz(todo-total, data.first.len))};
+-            if(!got)
+            mRing->writeAdvance(got / frameSize);
+            buffer = buffer.subspan(got);
+            if(buffer.empty())
+             {
+-                mDevice->handleDisconnect("Failed to read capture samples");
+-                break;
+                data = mRing->getWriteVector();
+                buffer = {data.first.buf, data.first.len*frameSize};
+             }
+-
+-            data.first.buf += got;
+-            data.first.len -= got;
+-            total += got;
+         }
+-        mRing->writeAdvance(total / frameSize);
+        if(buffer.empty())
+        {
+            /* Got samples to read, but no place to store it. Drop it. */
+            static char junk[4096];
+            sio_read(mSndHandle, junk, sizeof(junk) - (sizeof(junk)%frameSize));
+        }
+     }
+ 
+     return 0;
+@@ -371,76 +379,80 @@ void SndioCapture::open(const char *name)
+         throw al::backend_exception{al::backend_error::NoDevice, "Device name \"%s\" not found",
+             name};
+ 
+-    mSndHandle = sio_open(nullptr, SIO_REC, 0);
+    mSndHandle = sio_open(nullptr, SIO_REC, true);
+     if(mSndHandle == nullptr)
+         throw al::backend_exception{al::backend_error::NoDevice, "Could not open backend device"};
+ 
+-    sio_par par;
+-    sio_initpar(&par);
+-
+    SioPar par;
+     switch(mDevice->FmtType)
+     {
+     case DevFmtByte:
+-        par.bps = 1;
+        par.bits = 8;
+         par.sig = 1;
+         break;
+     case DevFmtUByte:
+-        par.bps = 1;
+        par.bits = 8;
+         par.sig = 0;
+         break;
+     case DevFmtShort:
+-        par.bps = 2;
+        par.bits = 16;
+         par.sig = 1;
+         break;
+     case DevFmtUShort:
+-        par.bps = 2;
+        par.bits = 16;
+         par.sig = 0;
+         break;
+     case DevFmtInt:
+-        par.bps = 4;
+        par.bits = 32;
+         par.sig = 1;
+         break;
+     case DevFmtUInt:
+-        par.bps = 4;
+        par.bits = 32;
+         par.sig = 0;
+         break;
+     case DevFmtFloat:
+         throw al::backend_exception{al::backend_error::DeviceError,
+             "%s capture samples not supported", DevFmtTypeString(mDevice->FmtType)};
+     }
+-    par.bits = par.bps * 8;
+    par.bps = SIO_BPS(par.bits);
+     par.le = SIO_LE_NATIVE;
+-    par.msb = SIO_LE_NATIVE ? 0 : 1;
+    par.msb = 1;
+     par.rchan = mDevice->channelsFromFmt();
+     par.rate = mDevice->Frequency;
+ 
+     par.appbufsz = maxu(mDevice->BufferSize, mDevice->Frequency/10);
+-    par.round = minu(par.appbufsz, mDevice->Frequency/40);
+    par.round = minu(par.appbufsz/2, mDevice->Frequency/40);
+ 
+-    mDevice->UpdateSize = par.round;
+-    mDevice->BufferSize = par.appbufsz;
+-
+     if(!sio_setpar(mSndHandle, &par) || !sio_getpar(mSndHandle, &par))
+         throw al::backend_exception{al::backend_error::DeviceError,
+             "Failed to set device praameters"};
+ 
+-    if(par.bits != par.bps*8)
+    if(par.bps > 1 && par.le != SIO_LE_NATIVE)
+         throw al::backend_exception{al::backend_error::DeviceError,
+            "%s-endian samples not supported", par.le ? "Little" : "Big"};
+    if(par.bits < par.bps*8 && !par.msb)
+        throw al::backend_exception{al::backend_error::DeviceError,
+             "Padded samples not supported (got %u of %u bits)", par.bits, par.bps*8};
+ 
+-    if(!((mDevice->FmtType == DevFmtByte && par.bits == 8 && par.sig != 0)
+-        || (mDevice->FmtType == DevFmtUByte && par.bits == 8 && par.sig == 0)
+-        || (mDevice->FmtType == DevFmtShort && par.bits == 16 && par.sig != 0)
+-        || (mDevice->FmtType == DevFmtUShort && par.bits == 16 && par.sig == 0)
+-        || (mDevice->FmtType == DevFmtInt && par.bits == 32 && par.sig != 0)
+-        || (mDevice->FmtType == DevFmtUInt && par.bits == 32 && par.sig == 0))
+-        || mDevice->channelsFromFmt() != par.rchan || mDevice->Frequency != par.rate)
+    auto match_fmt = [](DevFmtType fmttype, const sio_par &par) -> bool
+    {
+        return (fmttype == DevFmtByte && par.bps == 1 && par.sig != 0)
+            || (fmttype == DevFmtUByte && par.bps == 1 && par.sig == 0)
+            || (fmttype == DevFmtShort && par.bps == 2 && par.sig != 0)
+            || (fmttype == DevFmtUShort && par.bps == 2 && par.sig == 0)
+            || (fmttype == DevFmtInt && par.bps == 4 && par.sig != 0)
+            || (fmttype == DevFmtUInt && par.bps == 4 && par.sig == 0);
+    };
+    if(!match_fmt(mDevice->FmtType, par) || mDevice->channelsFromFmt() != par.rchan
+        || mDevice->Frequency != par.rate)
+         throw al::backend_exception{al::backend_error::DeviceError,
+             "Failed to set format %s %s %uhz, got %c%u %u-channel %uhz instead",
+             DevFmtTypeString(mDevice->FmtType), DevFmtChannelsString(mDevice->FmtChans),
+-            mDevice->Frequency, par.sig?'s':'u', par.bits, par.rchan, par.rate};
+            mDevice->Frequency, par.sig?'s':'u', par.bps*8, par.rchan, par.rate};
+ 
+     mRing = RingBuffer::Create(mDevice->BufferSize, par.bps*par.rchan, false);
+    mDevice->BufferSize = static_cast<uint>(mRing->writeSpace());
+    mDevice->UpdateSize = par.round;
+ 
+     setDefaultChannelOrder();
+ 
--- a/audio/plasma5-plasma-pa/distinfo
+++ b/audio/plasma5-plasma-pa/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1634665909
-SHA256 (KDE/plasma/5.23.1/plasma-pa-5.23.1.tar.xz) = a79f1971a5acdeccb9e7363560b1828f35cac4faeb3c8036d8cdd1243565a57e
-SIZE (KDE/plasma/5.23.1/plasma-pa-5.23.1.tar.xz) = 129972
+TIMESTAMP = 1635275005
+SHA256 (KDE/plasma/5.23.2/plasma-pa-5.23.2.tar.xz) = 564ff9f88fa223cd2fbcfb87effd6e93d4fd9be715c1c09149f4a071b783c315
+SIZE (KDE/plasma/5.23.2/plasma-pa-5.23.2.tar.xz) = 130036
--- a/audio/py-sounddevice/Makefile
+++ b/audio/py-sounddevice/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	sounddevice
-DISTVERSION=	0.4.2
+DISTVERSION=	0.4.3
 CATEGORIES=	audio python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/audio/py-sounddevice/distinfo
+++ b/audio/py-sounddevice/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1628466564
-SHA256 (sounddevice-0.4.2.tar.gz) = 1c9b07cff59c837d258002ed806ee134ed367ef11042bd7d283d6ce407bf889c
-SIZE (sounddevice-0.4.2.tar.gz) = 54120
+TIMESTAMP = 1634869958
+SHA256 (sounddevice-0.4.3.tar.gz) = f1667a7467b65fac4c4ebf668b4e9698eb7333fc3d32bc3c7ec9839ea7cb6c20
+SIZE (sounddevice-0.4.3.tar.gz) = 54224
--- a/audio/shortwave/Makefile
+++ b/audio/shortwave/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	shortwave
 DISTVERSION=	2.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio

 MAINTAINER=	jbeich@FreeBSD.org
@ -12,18 +12,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING.md
 LIB_DEPENDS=	libdbus-1.so:devel/dbus

 USES=		cargo gettext gnome meson pkgconfig python:build shebangfix sqlite ssl
-USE_GITHUB=	nodefault
 USE_GITLAB=	yes
 USE_GNOME=	gdkpixbuf2 gtk40 libadwaita
 USE_GSTREAMER1=	good libav soup vorbis
-GH_TUPLE=	gtk-rs:gtk3-rs:1ca4fbcc30ec882f6079f26018c30ef1ceb8a2e2:gtk3 \
-		gtk-rs:gtk4-rs:534f63e66a2a3883770fe110a8a556a4b40f84b3:gtk4
 GL_SITE=	https://gitlab.gnome.org
 GL_ACCOUNT=	World
 GL_PROJECT=	Shortwave
 GL_COMMIT=	9bfc5ee2d857035cf0d3c72e211b3d76b85d7414
-GL_TUPLE=	https://gitlab.freedesktop.org:gstreamer:gstreamer-rs:f00c57cd6f2a0912e04c10887cedbe95be7d5dea:gstreamer \
-		bilelmoussaoui:libadwaita-rs:2d09b6b566bc0fa2497612768cf0c41f582acdd7:libadwaita
 SHEBANG_FILES=	build-aux/meson/postinstall.py
 MAKE_ENV=	${CARGO_ENV}
 GLIB_SCHEMAS=	de.haeckerfelix.Shortwave.gschema.xml
@ -275,31 +270,11 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		winreg-0.6.2 \
-		ws2_32-sys-0.2.1
-CARGO_USE_GITHUB=	yes
-CARGO_USE_GITLAB=	yes
-CARGO_GIT_SUBDIR=	gstreamer:gstreamer-audio:gstreamer-audio \
-			gstreamer:gstreamer:gstreamer \
-			gtk3:cairo-rs:cairo \
-			gtk3:cairo-sys-rs:cairo/sys \
-			gtk3:gdk-pixbuf-sys:gdk-pixbuf/sys \
-			gtk3:gdk-pixbuf:gdk-pixbuf \
-			gtk3:gdk:gdk \
-			gtk3:gio-sys:gio/sys \
-			gtk3:gio:gio \
-			gtk3:glib-sys:glib/sys \
-			gtk3:glib:glib \
-			gtk3:gobject-sys:glib/gobject-sys \
-			gtk3:graphene-sys:graphene/sys \
-			gtk3:graphene:graphene \
-			gtk3:gtk:gtk \
-			gtk3:pango-sys:pango/sys \
-			gtk3:pango:pango \
-			gtk4:gdk-sys:gdk4/sys \
-			gtk4:gdk:gdk4 \
-			gtk4:gtk-sys:gtk4/sys \
-			gtk4:gtk:gtk4 \
-			libadwaita:adw:libadwaita
+		ws2_32-sys-0.2.1 \
+		gstreamer,gstreamer-audio,gstreamer-audio-sys,gstreamer-base,gstreamer-base-sys,gstreamer-sys@git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs\#f00c57cd6f2a0912e04c10887cedbe95be7d5dea \
+		cairo-rs,cairo-sys-rs,gdk-pixbuf,gdk-pixbuf-sys,gio,gio-sys,glib,glib-macros,glib-sys,gobject-sys,graphene-rs,graphene-sys,pango,pango-sys@git+https://github.com/gtk-rs/gtk3-rs\#1ca4fbcc30ec882f6079f26018c30ef1ceb8a2e2 \
+		gdk4,gdk4-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs\#534f63e66a2a3883770fe110a8a556a4b40f84b3 \
+		libadwaita,libadwaita-sys@git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs\#2d09b6b566bc0fa2497612768cf0c41f582acdd7
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 CARGO_TEST=	no
--- a/audio/shortwave/files/patch-gtk
+++ b/audio/shortwave/files/patch-gtk
@ -1,241 +0,0 @@
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256581
-
--- ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer/sys/Cargo.toml.orig	2021-04-23 12:28:54 UTC
-+++ ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "3"
- 
- [dependencies]
- libc = "0.2"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
- [dev-dependencies]
- shell-words = "1.0.0"
--- ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer-audio/sys/Cargo.toml.orig	2021-04-23 12:28:54 UTC
-+++ ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer-audio/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "3"
- 
- [dependencies]
- libc = "0.2"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
- [dependencies.gstreamer-base-sys]
- path = "../../gstreamer-base/sys"
--- ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer-base/sys/Cargo.toml.orig	2021-04-23 12:28:54 UTC
-+++ ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer-base/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "3"
- 
- [dependencies]
- libc = "0.2"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
- [dependencies.gstreamer-sys]
- path = "../../gstreamer/sys"
--- ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gdk4/sys/Cargo.toml.orig	2021-04-23 13:02:09 UTC
-+++ ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gdk4/sys/Cargo.toml
-@@ -28,27 +28,13 @@ v4_2 = []
- 
- [dependencies]
- libc = "0.2"
-
-[dependencies.cairo-sys-rs]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gdk-pixbuf-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gio-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.graphene-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.pango-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
- [build-dependencies]
- system-deps = "3"
--- ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gsk4/sys/Cargo.toml.orig	2021-04-23 13:02:09 UTC
-+++ ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gsk4/sys/Cargo.toml
-@@ -28,24 +28,14 @@ v4_2 = []
- 
- [dependencies]
- libc = "0.2"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
-[dependencies.cairo-sys-rs]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.graphene-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.pango-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
- 
- [build-dependencies]
- system-deps = "3"
--- ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gtk4/sys/Cargo.toml.orig	2021-04-23 13:02:09 UTC
-+++ ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gtk4/sys/Cargo.toml
-@@ -29,33 +29,19 @@ v4_2 = []
- 
- [dependencies]
- libc = "0.2"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
- 
-[dependencies.cairo-sys-rs]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gdk-pixbuf-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
- 
-[dependencies.gio-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.graphene-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
- [dependencies.gsk4-sys]
- path = "../../gsk4/sys"
-
-[dependencies.pango-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
- 
- [build-dependencies]
- system-deps = "3"
--- ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/Cargo.toml.orig	2021-04-20 20:15:58 UTC
-+++ ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/Cargo.toml
-@@ -8,28 +8,14 @@ edition = "2018"
- libc = '0.2'
- bitflags = '1.2'
- lazy_static = '1.4'
-+glib = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk = { package = "gdk4", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs" }
- [lib]
- name = "libadwaita"
-
-[dependencies.glib]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gio]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gdk-pixbuf]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.pango]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gdk]
-package = "gdk4"
-git = "https://github.com/gtk-rs/gtk4-rs"
-
-[dependencies.gtk]
-package = "gtk4"
-git = "https://github.com/gtk-rs/gtk4-rs"
- 
- [dependencies.ffi]
- package = "libadwaita-sys"
--- ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/sys/Cargo.toml.orig	2021-04-20 20:15:58 UTC
-+++ ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/sys/Cargo.toml
-@@ -16,29 +16,13 @@ name = "libadwaita_sys"
- 
- [dependencies]
- libc = "0.2"
-
-[dependencies.gio-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.glib-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gdk-pixbuf-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.pango-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk3-rs"
-
-[dependencies.gtk-sys]
-package = "gtk4-sys"
-git = "https://github.com/gtk-rs/gtk4-rs"
-
-[dependencies.gdk-sys]
-package = "gdk4-sys"
-git = "https://github.com/gtk-rs/gtk4-rs"
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gtk-sys = { package = "gtk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gdk-sys = { package = "gdk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
- 
- [build-dependencies]
- system-deps = "3"
--- a/audio/soundtouch/Makefile
+++ b/audio/soundtouch/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	soundtouch
 DISTVERSION=	2.3.1
 CATEGORIES=	audio
+MASTER_SITES=	https://www.surina.net/${PORTNAME}/

 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Open-source audio processing library
@ -11,23 +12,24 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.TXT

 USES=		cmake cpe
-USE_GITLAB=	yes
-GL_COMMIT=	e1f315f5358d9db5cee35a7a2886425489fcefe8
 USE_LDCONFIG=	yes

 CPE_VENDOR=	surina

+CFLAGS_i386=	-DSOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS
+
 CMAKE_ON=	BUILD_SHARED_LIBS

-OPTIONS_DEFINE=		INTEGER_SAMPLES OPTIMIZED_CFLAGS
-OPTIONS_DEFINE_aarch64=	NEON OPENMP
-OPTIONS_DEFINE_amd64=	OPENMP
-OPTIONS_DEFINE_armv7=	NEON
+OPTIONS_DEFINE=			INTEGER_SAMPLES OPTIMIZED_CFLAGS
+OPTIONS_DEFINE_aarch64=		NEON OPENMP
+OPTIONS_DEFINE_amd64=		OPENMP
+OPTIONS_DEFINE_armv7=		NEON
+OPTIONS_DEFINE_i386=		OPENMP
 OPTIONS_DEFINE_powerpc64=	OPENMP
 OPTIONS_DEFINE_powerpc64le=	OPENMP
-OPTIONS_DEFAULT=	${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/}
-OPTIONS_DEFAULT_aarch64=NEON OPENMP OPTIMIZED_CFLAGS
-OPTIONS_DEFAULT_amd64=	OPENMP OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=		${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/}
+OPTIONS_DEFAULT_aarch64=	NEON OPENMP OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT_amd64=		OPENMP OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT_powerpc64=	OPENMP OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT_powerpc64le=	OPENMP OPTIMIZED_CFLAGS

--- a/audio/soundtouch/distinfo
+++ b/audio/soundtouch/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1631831988
-SHA256 (soundtouch-soundtouch-e1f315f5358d9db5cee35a7a2886425489fcefe8_GL0.tar.gz) = 633ea27250f465533a5ada4ac0ff276a4be01f43e975e42b8507c50dfbbfd7f9
-SIZE (soundtouch-soundtouch-e1f315f5358d9db5cee35a7a2886425489fcefe8_GL0.tar.gz) = 524738
+TIMESTAMP = 1634244025
+SHA256 (soundtouch-2.3.1.tar.gz) = 6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1
+SIZE (soundtouch-2.3.1.tar.gz) = 524664
--- a/audio/spotify-tui/Makefile
+++ b/audio/spotify-tui/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	spotify-tui
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.25.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio

 MAINTAINER=	lcook@FreeBSD.org
--- a/audio/spotifyd/Makefile
+++ b/audio/spotifyd/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	spotifyd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	rodrigo@FreeBSD.org
--- a/audio/vban/Makefile
+++ b/audio/vban/Makefile
@ -4,6 +4,7 @@ PORTNAME=	vban
 DISTVERSION=	g20201011
 PORTREVISION=	1
 CATEGORIES=	audio
+PKGNAMESUFFIX=	-tools

 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Command-line VBAN (audio over UDP protocol) tools
@ -19,6 +20,8 @@ GH_TAGNAME=	4f69e5a
 PLIST_FILES=	bin/vban_emitter bin/vban_receptor bin/vban_sendtext
 PORTDOCS=	README.md

+PORTSCOUT=	skipv:2.1.0	# old tag from Oct 4 2018
+
 OPTIONS_DEFINE=	DOCS
 OPTIONS_MULTI=	BACKEND
 OPTIONS_MULTI_BACKEND=ALSA JACK PULSEAUDIO
--- a/benchmarks/hyperfine/Makefile
+++ b/benchmarks/hyperfine/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	hyperfine
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.11.0
-PORTREVISION=	8
+DISTVERSION=	1.12.0
+PORTREVISION=	0
 CATEGORIES=	benchmarks

 MAINTAINER=	pizzamig@FreeBSD.org
@ -20,79 +20,94 @@ GH_ACCOUNT=	sharkdp

 PLIST_FILES=	bin/hyperfine

-CARGO_CRATES=	ansi_term-0.11.0 \
-		approx-0.3.2 \
+CARGO_CRATES=	aho-corasick-0.7.18 \
+		ansi_term-0.11.0 \
+		approx-0.5.0 \
+		arrayvec-0.5.2 \
+		assert_cmd-2.0.2 \
 		atty-0.2.14 \
 		autocfg-0.1.7 \
 		autocfg-1.0.1 \
-		bitflags-1.2.1 \
-		bstr-0.2.13 \
-		byteorder-1.3.4 \
-		cfg-if-0.1.10 \
+		bitflags-1.3.2 \
+		bstr-0.2.17 \
+		cfg-if-1.0.0 \
 		clap-2.33.3 \
 		cloudabi-0.0.3 \
 		colored-2.0.0 \
-		console-0.12.0 \
-		csv-1.1.3 \
+		console-0.15.0 \
+		csv-1.1.6 \
 		csv-core-0.1.10 \
+		difflib-0.4.0 \
+		doc-comment-0.3.3 \
+		either-1.6.1 \
 		encode_unicode-0.3.6 \
+		float-cmp-0.9.0 \
 		fuchsia-cprng-0.1.1 \
-		getrandom-0.1.15 \
-		hermit-abi-0.1.17 \
-		indicatif-0.15.0 \
-		itoa-0.4.6 \
+		getrandom-0.2.3 \
+		hermit-abi-0.1.19 \
+		indicatif-0.16.2 \
+		itertools-0.10.1 \
+		itoa-0.4.8 \
 		lazy_static-1.4.0 \
-		libc-0.2.79 \
-		memchr-2.3.3 \
+		libc-0.2.104 \
+		memchr-2.4.1 \
+		normalize-line-endings-0.3.0 \
 		num-0.2.1 \
 		num-bigint-0.2.6 \
 		num-complex-0.2.4 \
-		num-integer-0.1.43 \
-		num-iter-0.1.41 \
+		num-integer-0.1.44 \
+		num-iter-0.1.42 \
 		num-rational-0.2.4 \
-		num-traits-0.2.12 \
-		number_prefix-0.3.0 \
-		ppv-lite86-0.2.9 \
-		proc-macro2-1.0.24 \
-		quote-1.0.7 \
+		num-traits-0.2.14 \
+		number_prefix-0.4.0 \
+		once_cell-1.8.0 \
+		ppv-lite86-0.2.14 \
+		predicates-2.0.3 \
+		predicates-core-1.0.2 \
+		predicates-tree-1.0.4 \
+		proc-macro2-1.0.30 \
+		quote-1.0.10 \
 		rand-0.6.5 \
-		rand-0.7.3 \
+		rand-0.8.4 \
 		rand_chacha-0.1.1 \
-		rand_chacha-0.2.2 \
+		rand_chacha-0.3.1 \
 		rand_core-0.3.1 \
 		rand_core-0.4.2 \
-		rand_core-0.5.1 \
+		rand_core-0.6.3 \
 		rand_hc-0.1.0 \
-		rand_hc-0.2.0 \
+		rand_hc-0.3.1 \
 		rand_isaac-0.1.1 \
 		rand_jitter-0.1.4 \
 		rand_os-0.1.3 \
 		rand_pcg-0.1.2 \
 		rand_xorshift-0.1.1 \
 		rdrand-0.4.0 \
-		regex-1.4.1 \
-		regex-automata-0.1.9 \
-		regex-syntax-0.6.20 \
-		rust_decimal-1.8.1 \
+		redox_syscall-0.2.10 \
+		regex-1.5.4 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.25 \
+		remove_dir_all-0.5.3 \
+		rust_decimal-1.16.0 \
 		ryu-1.0.5 \
-		serde-1.0.117 \
-		serde_derive-1.0.117 \
-		serde_json-1.0.59 \
+		serde-1.0.130 \
+		serde_derive-1.0.130 \
+		serde_json-1.0.68 \
+		shell-words-1.0.0 \
 		statistical-1.0.0 \
 		strsim-0.8.0 \
-		syn-1.0.44 \
+		syn-1.0.80 \
+		tempfile-3.2.0 \
 		term_size-0.3.2 \
-		terminal_size-0.1.13 \
-		termios-0.3.3 \
+		terminal_size-0.1.17 \
+		termtree-0.2.1 \
 		textwrap-0.11.0 \
-		unicode-width-0.1.8 \
-		unicode-xid-0.2.1 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.2.2 \
 		vec_map-0.8.2 \
-		version_check-0.9.2 \
-		wasi-0.9.0+wasi-snapshot-preview1 \
+		wait-timeout-0.2.0 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0

 post-install:
--- a/benchmarks/hyperfine/distinfo
+++ b/benchmarks/hyperfine/distinfo
@ -1,151 +1,181 @@
-TIMESTAMP = 1603014363
-SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
-SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087
-SHA256 (rust/crates/approx-0.3.2.tar.gz) = f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3
-SIZE (rust/crates/approx-0.3.2.tar.gz) = 14288
-SHA256 (rust/crates/atty-0.2.14.tar.gz) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
-SIZE (rust/crates/atty-0.2.14.tar.gz) = 5470
-SHA256 (rust/crates/autocfg-0.1.7.tar.gz) = 1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2
-SIZE (rust/crates/autocfg-0.1.7.tar.gz) = 12158
-SHA256 (rust/crates/autocfg-1.0.1.tar.gz) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
-SIZE (rust/crates/autocfg-1.0.1.tar.gz) = 12908
-SHA256 (rust/crates/bitflags-1.2.1.tar.gz) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
-SIZE (rust/crates/bitflags-1.2.1.tar.gz) = 16745
-SHA256 (rust/crates/bstr-0.2.13.tar.gz) = 31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931
-SIZE (rust/crates/bstr-0.2.13.tar.gz) = 345445
-SHA256 (rust/crates/byteorder-1.3.4.tar.gz) = 08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de
-SIZE (rust/crates/byteorder-1.3.4.tar.gz) = 21943
-SHA256 (rust/crates/cfg-if-0.1.10.tar.gz) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
-SIZE (rust/crates/cfg-if-0.1.10.tar.gz) = 7933
-SHA256 (rust/crates/clap-2.33.3.tar.gz) = 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002
-SIZE (rust/crates/clap-2.33.3.tar.gz) = 201925
-SHA256 (rust/crates/cloudabi-0.0.3.tar.gz) = ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f
-SIZE (rust/crates/cloudabi-0.0.3.tar.gz) = 22156
-SHA256 (rust/crates/colored-2.0.0.tar.gz) = b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd
-SIZE (rust/crates/colored-2.0.0.tar.gz) = 21619
-SHA256 (rust/crates/console-0.12.0.tar.gz) = c0b1aacfaffdbff75be81c15a399b4bedf78aaefe840e8af1d299ac2ade885d2
-SIZE (rust/crates/console-0.12.0.tar.gz) = 21278
-SHA256 (rust/crates/csv-1.1.3.tar.gz) = 00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279
-SIZE (rust/crates/csv-1.1.3.tar.gz) = 890849
-SHA256 (rust/crates/csv-core-0.1.10.tar.gz) = 2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90
-SIZE (rust/crates/csv-core-0.1.10.tar.gz) = 25668
-SHA256 (rust/crates/encode_unicode-0.3.6.tar.gz) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
-SIZE (rust/crates/encode_unicode-0.3.6.tar.gz) = 45741
-SHA256 (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba
-SIZE (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = 2950
-SHA256 (rust/crates/getrandom-0.1.15.tar.gz) = fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6
-SIZE (rust/crates/getrandom-0.1.15.tar.gz) = 24786
-SHA256 (rust/crates/hermit-abi-0.1.17.tar.gz) = 5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8
-SIZE (rust/crates/hermit-abi-0.1.17.tar.gz) = 10065
-SHA256 (rust/crates/indicatif-0.15.0.tar.gz) = 7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4
-SIZE (rust/crates/indicatif-0.15.0.tar.gz) = 28897
-SHA256 (rust/crates/itoa-0.4.6.tar.gz) = dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6
-SIZE (rust/crates/itoa-0.4.6.tar.gz) = 12167
-SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
-SIZE (rust/crates/lazy_static-1.4.0.tar.gz) = 10443
-SHA256 (rust/crates/libc-0.2.79.tar.gz) = 2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743
-SIZE (rust/crates/libc-0.2.79.tar.gz) = 511752
-SHA256 (rust/crates/memchr-2.3.3.tar.gz) = 3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400
-SIZE (rust/crates/memchr-2.3.3.tar.gz) = 22566
-SHA256 (rust/crates/num-0.2.1.tar.gz) = b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36
-SIZE (rust/crates/num-0.2.1.tar.gz) = 9082
-SHA256 (rust/crates/num-bigint-0.2.6.tar.gz) = 090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304
-SIZE (rust/crates/num-bigint-0.2.6.tar.gz) = 87275
-SHA256 (rust/crates/num-complex-0.2.4.tar.gz) = b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95
-SIZE (rust/crates/num-complex-0.2.4.tar.gz) = 24679
-SHA256 (rust/crates/num-integer-0.1.43.tar.gz) = 8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b
-SIZE (rust/crates/num-integer-0.1.43.tar.gz) = 21966
-SHA256 (rust/crates/num-iter-0.1.41.tar.gz) = 7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f
-SIZE (rust/crates/num-iter-0.1.41.tar.gz) = 10198
-SHA256 (rust/crates/num-rational-0.2.4.tar.gz) = 5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef
-SIZE (rust/crates/num-rational-0.2.4.tar.gz) = 21694
-SHA256 (rust/crates/num-traits-0.2.12.tar.gz) = ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611
-SIZE (rust/crates/num-traits-0.2.12.tar.gz) = 43807
-SHA256 (rust/crates/number_prefix-0.3.0.tar.gz) = 17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a
-SIZE (rust/crates/number_prefix-0.3.0.tar.gz) = 6291
-SHA256 (rust/crates/ppv-lite86-0.2.9.tar.gz) = c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20
-SIZE (rust/crates/ppv-lite86-0.2.9.tar.gz) = 20933
-SHA256 (rust/crates/proc-macro2-1.0.24.tar.gz) = 1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71
-SIZE (rust/crates/proc-macro2-1.0.24.tar.gz) = 37716
-SHA256 (rust/crates/quote-1.0.7.tar.gz) = aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37
-SIZE (rust/crates/quote-1.0.7.tar.gz) = 25170
-SHA256 (rust/crates/rand-0.6.5.tar.gz) = 6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca
-SIZE (rust/crates/rand-0.6.5.tar.gz) = 104814
-SHA256 (rust/crates/rand-0.7.3.tar.gz) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
-SIZE (rust/crates/rand-0.7.3.tar.gz) = 112246
-SHA256 (rust/crates/rand_chacha-0.1.1.tar.gz) = 556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef
-SIZE (rust/crates/rand_chacha-0.1.1.tar.gz) = 11703
-SHA256 (rust/crates/rand_chacha-0.2.2.tar.gz) = f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402
-SIZE (rust/crates/rand_chacha-0.2.2.tar.gz) = 13267
-SHA256 (rust/crates/rand_core-0.3.1.tar.gz) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b
-SIZE (rust/crates/rand_core-0.3.1.tar.gz) = 15483
-SHA256 (rust/crates/rand_core-0.4.2.tar.gz) = 9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc
-SIZE (rust/crates/rand_core-0.4.2.tar.gz) = 20243
-SHA256 (rust/crates/rand_core-0.5.1.tar.gz) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19
-SIZE (rust/crates/rand_core-0.5.1.tar.gz) = 21116
-SHA256 (rust/crates/rand_hc-0.1.0.tar.gz) = 7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4
-SIZE (rust/crates/rand_hc-0.1.0.tar.gz) = 11644
-SHA256 (rust/crates/rand_hc-0.2.0.tar.gz) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
-SIZE (rust/crates/rand_hc-0.2.0.tar.gz) = 11670
-SHA256 (rust/crates/rand_isaac-0.1.1.tar.gz) = ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08
-SIZE (rust/crates/rand_isaac-0.1.1.tar.gz) = 16020
-SHA256 (rust/crates/rand_jitter-0.1.4.tar.gz) = 1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b
-SIZE (rust/crates/rand_jitter-0.1.4.tar.gz) = 18409
-SHA256 (rust/crates/rand_os-0.1.3.tar.gz) = 7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071
-SIZE (rust/crates/rand_os-0.1.3.tar.gz) = 18965
-SHA256 (rust/crates/rand_pcg-0.1.2.tar.gz) = abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44
-SIZE (rust/crates/rand_pcg-0.1.2.tar.gz) = 10844
-SHA256 (rust/crates/rand_xorshift-0.1.1.tar.gz) = cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c
-SIZE (rust/crates/rand_xorshift-0.1.1.tar.gz) = 8997
-SHA256 (rust/crates/rdrand-0.4.0.tar.gz) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2
-SIZE (rust/crates/rdrand-0.4.0.tar.gz) = 6456
-SHA256 (rust/crates/regex-1.4.1.tar.gz) = 8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b
-SIZE (rust/crates/regex-1.4.1.tar.gz) = 236871
-SHA256 (rust/crates/regex-automata-0.1.9.tar.gz) = ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4
-SIZE (rust/crates/regex-automata-0.1.9.tar.gz) = 114560
-SHA256 (rust/crates/regex-syntax-0.6.20.tar.gz) = 8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c
-SIZE (rust/crates/regex-syntax-0.6.20.tar.gz) = 293727
-SHA256 (rust/crates/rust_decimal-1.8.1.tar.gz) = c9e81662973c7a8d9663e64a0de4cd642b89a21d64966e3d99606efdc5fb0cc6
-SIZE (rust/crates/rust_decimal-1.8.1.tar.gz) = 48138
-SHA256 (rust/crates/ryu-1.0.5.tar.gz) = 71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e
-SIZE (rust/crates/ryu-1.0.5.tar.gz) = 49570
-SHA256 (rust/crates/serde-1.0.117.tar.gz) = b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a
-SIZE (rust/crates/serde-1.0.117.tar.gz) = 74505
-SHA256 (rust/crates/serde_derive-1.0.117.tar.gz) = cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e
-SIZE (rust/crates/serde_derive-1.0.117.tar.gz) = 50712
-SHA256 (rust/crates/serde_json-1.0.59.tar.gz) = dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95
-SIZE (rust/crates/serde_json-1.0.59.tar.gz) = 114956
-SHA256 (rust/crates/statistical-1.0.0.tar.gz) = 49d57902bb128e5e38b5218d3681215ae3e322d99f65d5420e9849730d2ea372
-SIZE (rust/crates/statistical-1.0.0.tar.gz) = 5822
-SHA256 (rust/crates/strsim-0.8.0.tar.gz) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
-SIZE (rust/crates/strsim-0.8.0.tar.gz) = 9309
-SHA256 (rust/crates/syn-1.0.44.tar.gz) = e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd
-SIZE (rust/crates/syn-1.0.44.tar.gz) = 225524
-SHA256 (rust/crates/term_size-0.3.2.tar.gz) = 1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9
-SIZE (rust/crates/term_size-0.3.2.tar.gz) = 10917
-SHA256 (rust/crates/terminal_size-0.1.13.tar.gz) = 9a14cd9f8c72704232f0bfc8455c0e861f0ad4eb60cc9ec8a170e231414c1e13
-SIZE (rust/crates/terminal_size-0.1.13.tar.gz) = 8094
-SHA256 (rust/crates/termios-0.3.3.tar.gz) = 411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b
-SIZE (rust/crates/termios-0.3.3.tar.gz) = 17103
-SHA256 (rust/crates/textwrap-0.11.0.tar.gz) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
-SIZE (rust/crates/textwrap-0.11.0.tar.gz) = 17322
-SHA256 (rust/crates/unicode-width-0.1.8.tar.gz) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
-SIZE (rust/crates/unicode-width-0.1.8.tar.gz) = 16732
-SHA256 (rust/crates/unicode-xid-0.2.1.tar.gz) = f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564
-SIZE (rust/crates/unicode-xid-0.2.1.tar.gz) = 14392
-SHA256 (rust/crates/vec_map-0.8.2.tar.gz) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
-SIZE (rust/crates/vec_map-0.8.2.tar.gz) = 14466
-SHA256 (rust/crates/version_check-0.9.2.tar.gz) = b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed
-SIZE (rust/crates/version_check-0.9.2.tar.gz) = 11979
-SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
-SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = 31521
-SHA256 (rust/crates/winapi-0.3.9.tar.gz) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
-SIZE (rust/crates/winapi-0.3.9.tar.gz) = 1200382
-SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
-SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815
-SHA256 (rust/crates/winapi-util-0.1.5.tar.gz) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178
-SIZE (rust/crates/winapi-util-0.1.5.tar.gz) = 10164
-SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
-SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
-SHA256 (sharkdp-hyperfine-v1.11.0_GH0.tar.gz) = 740f4826f0933c693fb281e3542d312da9ccc8fd68cebe883359a8085ddd77e9
-SIZE (sharkdp-hyperfine-v1.11.0_GH0.tar.gz) = 48228
+TIMESTAMP = 1634655305
+SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
+SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
+SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
+SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087
+SHA256 (rust/crates/approx-0.5.0.crate) = 072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e
+SIZE (rust/crates/approx-0.5.0.crate) = 14359
+SHA256 (rust/crates/arrayvec-0.5.2.crate) = 23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b
+SIZE (rust/crates/arrayvec-0.5.2.crate) = 27838
+SHA256 (rust/crates/assert_cmd-2.0.2.crate) = e996dc7940838b7ef1096b882e29ec30a3149a3a443cdc8dba19ed382eca1fe2
+SIZE (rust/crates/assert_cmd-2.0.2.crate) = 29433
+SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/autocfg-0.1.7.crate) = 1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2
+SIZE (rust/crates/autocfg-0.1.7.crate) = 12158
+SHA256 (rust/crates/autocfg-1.0.1.crate) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
+SIZE (rust/crates/autocfg-1.0.1.crate) = 12908
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/bstr-0.2.17.crate) = ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223
+SIZE (rust/crates/bstr-0.2.17.crate) = 330350
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/clap-2.33.3.crate) = 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002
+SIZE (rust/crates/clap-2.33.3.crate) = 201925
+SHA256 (rust/crates/cloudabi-0.0.3.crate) = ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f
+SIZE (rust/crates/cloudabi-0.0.3.crate) = 22156
+SHA256 (rust/crates/colored-2.0.0.crate) = b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd
+SIZE (rust/crates/colored-2.0.0.crate) = 21619
+SHA256 (rust/crates/console-0.15.0.crate) = a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31
+SIZE (rust/crates/console-0.15.0.crate) = 23507
+SHA256 (rust/crates/csv-1.1.6.crate) = 22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1
+SIZE (rust/crates/csv-1.1.6.crate) = 886999
+SHA256 (rust/crates/csv-core-0.1.10.crate) = 2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90
+SIZE (rust/crates/csv-core-0.1.10.crate) = 25668
+SHA256 (rust/crates/difflib-0.4.0.crate) = 6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8
+SIZE (rust/crates/difflib-0.4.0.crate) = 7638
+SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10
+SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123
+SHA256 (rust/crates/either-1.6.1.crate) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457
+SIZE (rust/crates/either-1.6.1.crate) = 13641
+SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
+SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741
+SHA256 (rust/crates/float-cmp-0.9.0.crate) = 98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4
+SIZE (rust/crates/float-cmp-0.9.0.crate) = 10102
+SHA256 (rust/crates/fuchsia-cprng-0.1.1.crate) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba
+SIZE (rust/crates/fuchsia-cprng-0.1.1.crate) = 2950
+SHA256 (rust/crates/getrandom-0.2.3.crate) = 7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753
+SIZE (rust/crates/getrandom-0.2.3.crate) = 26261
+SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
+SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
+SHA256 (rust/crates/indicatif-0.16.2.crate) = 2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b
+SIZE (rust/crates/indicatif-0.16.2.crate) = 35057
+SHA256 (rust/crates/itertools-0.10.1.crate) = 69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf
+SIZE (rust/crates/itertools-0.10.1.crate) = 116219
+SHA256 (rust/crates/itoa-0.4.8.crate) = b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4
+SIZE (rust/crates/itoa-0.4.8.crate) = 11926
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/libc-0.2.104.crate) = 7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce
+SIZE (rust/crates/libc-0.2.104.crate) = 548775
+SHA256 (rust/crates/memchr-2.4.1.crate) = 308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a
+SIZE (rust/crates/memchr-2.4.1.crate) = 64977
+SHA256 (rust/crates/normalize-line-endings-0.3.0.crate) = 61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be
+SIZE (rust/crates/normalize-line-endings-0.3.0.crate) = 5737
+SHA256 (rust/crates/num-0.2.1.crate) = b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36
+SIZE (rust/crates/num-0.2.1.crate) = 9082
+SHA256 (rust/crates/num-bigint-0.2.6.crate) = 090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304
+SIZE (rust/crates/num-bigint-0.2.6.crate) = 87275
+SHA256 (rust/crates/num-complex-0.2.4.crate) = b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95
+SIZE (rust/crates/num-complex-0.2.4.crate) = 24679
+SHA256 (rust/crates/num-integer-0.1.44.crate) = d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db
+SIZE (rust/crates/num-integer-0.1.44.crate) = 22216
+SHA256 (rust/crates/num-iter-0.1.42.crate) = b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59
+SIZE (rust/crates/num-iter-0.1.42.crate) = 10450
+SHA256 (rust/crates/num-rational-0.2.4.crate) = 5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef
+SIZE (rust/crates/num-rational-0.2.4.crate) = 21694
+SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290
+SIZE (rust/crates/num-traits-0.2.14.crate) = 45476
+SHA256 (rust/crates/number_prefix-0.4.0.crate) = 830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3
+SIZE (rust/crates/number_prefix-0.4.0.crate) = 6922
+SHA256 (rust/crates/once_cell-1.8.0.crate) = 692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56
+SIZE (rust/crates/once_cell-1.8.0.crate) = 28925
+SHA256 (rust/crates/ppv-lite86-0.2.14.crate) = c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741
+SIZE (rust/crates/ppv-lite86-0.2.14.crate) = 21543
+SHA256 (rust/crates/predicates-2.0.3.crate) = 5c6ce811d0b2e103743eec01db1c50612221f173084ce2f7941053e94b6bb474
+SIZE (rust/crates/predicates-2.0.3.crate) = 29239
+SHA256 (rust/crates/predicates-core-1.0.2.crate) = 57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451
+SIZE (rust/crates/predicates-core-1.0.2.crate) = 8185
+SHA256 (rust/crates/predicates-tree-1.0.4.crate) = 338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7
+SIZE (rust/crates/predicates-tree-1.0.4.crate) = 7682
+SHA256 (rust/crates/proc-macro2-1.0.30.crate) = edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70
+SIZE (rust/crates/proc-macro2-1.0.30.crate) = 39155
+SHA256 (rust/crates/quote-1.0.10.crate) = 38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05
+SIZE (rust/crates/quote-1.0.10.crate) = 29960
+SHA256 (rust/crates/rand-0.6.5.crate) = 6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca
+SIZE (rust/crates/rand-0.6.5.crate) = 104814
+SHA256 (rust/crates/rand-0.8.4.crate) = 2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8
+SIZE (rust/crates/rand-0.8.4.crate) = 87406
+SHA256 (rust/crates/rand_chacha-0.1.1.crate) = 556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef
+SIZE (rust/crates/rand_chacha-0.1.1.crate) = 11703
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.3.1.crate) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b
+SIZE (rust/crates/rand_core-0.3.1.crate) = 15483
+SHA256 (rust/crates/rand_core-0.4.2.crate) = 9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc
+SIZE (rust/crates/rand_core-0.4.2.crate) = 20243
+SHA256 (rust/crates/rand_core-0.6.3.crate) = d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7
+SIZE (rust/crates/rand_core-0.6.3.crate) = 21938
+SHA256 (rust/crates/rand_hc-0.1.0.crate) = 7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4
+SIZE (rust/crates/rand_hc-0.1.0.crate) = 11644
+SHA256 (rust/crates/rand_hc-0.3.1.crate) = d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7
+SIZE (rust/crates/rand_hc-0.3.1.crate) = 11891
+SHA256 (rust/crates/rand_isaac-0.1.1.crate) = ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08
+SIZE (rust/crates/rand_isaac-0.1.1.crate) = 16020
+SHA256 (rust/crates/rand_jitter-0.1.4.crate) = 1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b
+SIZE (rust/crates/rand_jitter-0.1.4.crate) = 18409
+SHA256 (rust/crates/rand_os-0.1.3.crate) = 7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071
+SIZE (rust/crates/rand_os-0.1.3.crate) = 18965
+SHA256 (rust/crates/rand_pcg-0.1.2.crate) = abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44
+SIZE (rust/crates/rand_pcg-0.1.2.crate) = 10844
+SHA256 (rust/crates/rand_xorshift-0.1.1.crate) = cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c
+SIZE (rust/crates/rand_xorshift-0.1.1.crate) = 8997
+SHA256 (rust/crates/rdrand-0.4.0.crate) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2
+SIZE (rust/crates/rdrand-0.4.0.crate) = 6456
+SHA256 (rust/crates/redox_syscall-0.2.10.crate) = 8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff
+SIZE (rust/crates/redox_syscall-0.2.10.crate) = 23582
+SHA256 (rust/crates/regex-1.5.4.crate) = d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461
+SIZE (rust/crates/regex-1.5.4.crate) = 236581
+SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
+SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
+SHA256 (rust/crates/regex-syntax-0.6.25.crate) = f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b
+SIZE (rust/crates/regex-syntax-0.6.25.crate) = 293293
+SHA256 (rust/crates/remove_dir_all-0.5.3.crate) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7
+SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184
+SHA256 (rust/crates/rust_decimal-1.16.0.crate) = e0f1028de22e436bb35fce070310ee57d57b5e59ae77b4e3f24ce4773312b813
+SIZE (rust/crates/rust_decimal-1.16.0.crate) = 102880
+SHA256 (rust/crates/ryu-1.0.5.crate) = 71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e
+SIZE (rust/crates/ryu-1.0.5.crate) = 49570
+SHA256 (rust/crates/serde-1.0.130.crate) = f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913
+SIZE (rust/crates/serde-1.0.130.crate) = 75305
+SHA256 (rust/crates/serde_derive-1.0.130.crate) = d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b
+SIZE (rust/crates/serde_derive-1.0.130.crate) = 54703
+SHA256 (rust/crates/serde_json-1.0.68.crate) = 0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8
+SIZE (rust/crates/serde_json-1.0.68.crate) = 114986
+SHA256 (rust/crates/shell-words-1.0.0.crate) = b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074
+SIZE (rust/crates/shell-words-1.0.0.crate) = 9798
+SHA256 (rust/crates/statistical-1.0.0.crate) = 49d57902bb128e5e38b5218d3681215ae3e322d99f65d5420e9849730d2ea372
+SIZE (rust/crates/statistical-1.0.0.crate) = 5822
+SHA256 (rust/crates/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
+SIZE (rust/crates/strsim-0.8.0.crate) = 9309
+SHA256 (rust/crates/syn-1.0.80.crate) = d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194
+SIZE (rust/crates/syn-1.0.80.crate) = 234102
+SHA256 (rust/crates/tempfile-3.2.0.crate) = dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22
+SIZE (rust/crates/tempfile-3.2.0.crate) = 25892
+SHA256 (rust/crates/term_size-0.3.2.crate) = 1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9
+SIZE (rust/crates/term_size-0.3.2.crate) = 10917
+SHA256 (rust/crates/terminal_size-0.1.17.crate) = 633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df
+SIZE (rust/crates/terminal_size-0.1.17.crate) = 9141
+SHA256 (rust/crates/termtree-0.2.1.crate) = 78fbf2dd23e79c28ccfa2472d3e6b3b189866ffef1aeb91f17c2d968b6586378
+SIZE (rust/crates/termtree-0.2.1.crate) = 6375
+SHA256 (rust/crates/textwrap-0.11.0.crate) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
+SIZE (rust/crates/textwrap-0.11.0.crate) = 17322
+SHA256 (rust/crates/unicode-width-0.1.9.crate) = 3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973
+SIZE (rust/crates/unicode-width-0.1.9.crate) = 16745
+SHA256 (rust/crates/unicode-xid-0.2.2.crate) = 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3
+SIZE (rust/crates/unicode-xid-0.2.2.crate) = 14955
+SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
+SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
+SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6
+SIZE (rust/crates/wait-timeout-0.2.0.crate) = 12441
+SHA256 (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6
+SIZE (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = 27505
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (sharkdp-hyperfine-v1.12.0_GH0.tar.gz) = 2120870a97e68fa3426eac5646a071c9646e96d2309220e3c258bf588e496454
+SIZE (sharkdp-hyperfine-v1.12.0_GH0.tar.gz) = 52885
--- a/benchmarks/hyperfine/files/patch-powerpc
+++ b/benchmarks/hyperfine/files/patch-powerpc
@ -1,62 +0,0 @@
--- cargo-crates/libc-0.2.79/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig	2020-03-17 20:35:43 UTC
-+++ cargo-crates/libc-0.2.79/src/unix/bsd/freebsdlike/freebsd/mod.rs
-@@ -1486,6 +1486,9 @@ cfg_if! {
-     } else if #[cfg(target_arch = "powerpc64")] {
-         mod powerpc64;
-         pub use self::powerpc64::*;
-+    } else if #[cfg(target_arch = "powerpc")] {
-+        mod powerpc;
-+        pub use self::powerpc::*;
-     } else {
-         // Unknown target_arch
-     }
--- cargo-crates/libc-0.2.79/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig	2021-06-23 22:40:24 UTC
-+++ cargo-crates/libc-0.2.79/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
-@@ -0,0 +1,47 @@
-+pub type c_char = u8;
-+pub type c_long = i32;
-+pub type c_ulong = u32;
-+pub type wchar_t = i32;
-+pub type time_t = i64;
-+pub type suseconds_t = i32;
-+pub type register_t = i32;
-+
-+s! {
-+    pub struct stat {
-+        pub st_dev: ::dev_t,
-+        pub st_ino: ::ino_t,
-+        pub st_mode: ::mode_t,
-+        pub st_nlink: ::nlink_t,
-+        pub st_uid: ::uid_t,
-+        pub st_gid: ::gid_t,
-+        pub st_rdev: ::dev_t,
-+        pub st_atime: ::time_t,
-+        pub st_atime_nsec: ::c_long,
-+        pub st_mtime: ::time_t,
-+        pub st_mtime_nsec: ::c_long,
-+        pub st_ctime: ::time_t,
-+        pub st_ctime_nsec: ::c_long,
-+        pub st_size: ::off_t,
-+        pub st_blocks: ::blkcnt_t,
-+        pub st_blksize: ::blksize_t,
-+        pub st_flags: ::fflags_t,
-+        pub st_gen: u32,
-+        pub st_lspare: i32,
-+        pub st_birthtime: ::time_t,
-+        pub st_birthtime_nsec: ::c_long,
-+    }
-+}
-+
-+// should be pub(crate), but that requires Rust 1.18.0
-+cfg_if! {
-+    if #[cfg(libc_const_size_of)] {
-+        #[doc(hidden)]
-+        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
-+    } else {
-+        #[doc(hidden)]
-+        pub const _ALIGNBYTES: usize = 4 - 1;
-+    }
-+}
-+
-+pub const MAP_32BIT: ::c_int = 0x00080000;
-+pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
--- a/benchmarks/inferno/Makefile
+++ b/benchmarks/inferno/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	inferno
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	benchmarks

 MAINTAINER=	yuri@FreeBSD.org
--- a/benchmarks/rubygem-benchmark/Makefile
+++ b/benchmarks/rubygem-benchmark/Makefile
@ -1,7 +1,7 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>

 PORTNAME=	benchmark
-PORTVERSION=	0.1.1
+PORTVERSION=	0.2.0
 CATEGORIES=	benchmarks rubygems
 MASTER_SITES=	RG

--- a/benchmarks/rubygem-benchmark/distinfo
+++ b/benchmarks/rubygem-benchmark/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1608730765
-SHA256 (rubygem/benchmark-0.1.1.gem) = 86a5c212232bea5bec7d9cdff8a11931eb21693c39c42ca5d8673b00c8a179cb
-SIZE (rubygem/benchmark-0.1.1.gem) = 12288
+TIMESTAMP = 1634391182
+SHA256 (rubygem/benchmark-0.2.0.gem) = 5f7087b794613abdd3ac9c13f4351f65b164bcb15ced2ad29508e365f9b28c77
+SIZE (rubygem/benchmark-0.2.0.gem) = 12800
--- a/biology/Makefile
+++ b/biology/Makefile
@ -138,7 +138,6 @@
    SUBDIR += psi88
    SUBDIR += py-Genesis-PyAPI
    SUBDIR += py-PySCeS
-    SUBDIR += py-pybigwig
    SUBDIR += py-biom-format
    SUBDIR += py-biopython
    SUBDIR += py-bx-python
@ -162,6 +161,7 @@
    SUBDIR += py-orange3-single-cell
    SUBDIR += py-pandas-charm
    SUBDIR += py-py2bit
+    SUBDIR += py-pybigwig
    SUBDIR += py-pyfaidx
    SUBDIR += py-pysam
    SUBDIR += py-python-libsbml
--- a/biology/gmap/Makefile
+++ b/biology/gmap/Makefile
@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept

 ONLY_FOR_ARCHS=		amd64 i386 powerpc64le
-ONLY_FOR_ARCHS_REASON=	Upstream supports only x86 and possibly POWER8
+ONLY_FOR_ARCHS_REASON=	upstream supports only x86 and possibly POWER8

 USES=		gmake perl5
 GNU_CONFIGURE=	yes
--- a/biology/linux-foldingathome/Makefile
+++ b/biology/linux-foldingathome/Makefile
@ -19,7 +19,7 @@ LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell \
 		auto-accept

 ONLY_FOR_ARCHS=	amd64
-ONLY_FOR_ARCHS_REASON=	The i386 client has not been ported
+ONLY_FOR_ARCHS_REASON=	has not been ported to this architecture

 USES=		dos2unix linux
 DOS2UNIX_FILES=	usr/share/doc/fahclient/*
--- a/biology/mafft/Makefile
+++ b/biology/mafft/Makefile
@ -1,7 +1,7 @@
 # Created by: Fernan Aguero <fernan@iib.unsam.edu.ar>

 PORTNAME=	mafft
-PORTVERSION=	7.266
+PORTVERSION=	7.267
 CATEGORIES=	biology
 MASTER_SITES=	http://mafft.cbrc.jp/alignment/software/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-without-extensions-src
--- a/biology/mafft/distinfo
+++ b/biology/mafft/distinfo
@ -1,2 +1,3 @@
-SHA256 (mafft-7.266-without-extensions-src.tgz) = 59d4921e13377bb2c8e1f0a007e94b3e698e2c546ce8facc9daa530bc673e707
-SIZE (mafft-7.266-without-extensions-src.tgz) = 440576
+TIMESTAMP = 1634878254
+SHA256 (mafft-7.267-without-extensions-src.tgz) = 60526e38d3faf3e8d96d9a2e2ecfc9662f0e61c71ed2bc35d07c769703ee86f6
+SIZE (mafft-7.267-without-extensions-src.tgz) = 435174
--- a/biology/minimap2/Makefile
+++ b/biology/minimap2/Makefile
@ -1,7 +1,7 @@
-PORTNAME=		minimap2
+PORTNAME=	minimap2
 DISTVERSIONPREFIX=	v
-DISTVERSION=		2.22
-CATEGORIES=		biology
+DISTVERSION=	2.22
+CATEGORIES=	biology

 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Pairwise aligner for genomic and spliced nucleotide sequences
@ -10,7 +10,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

 ONLY_FOR_ARCHS=	amd64 i386
-ONLY_FOR_ARCHS_REASON=	Hard-coded SSE instructions
+ONLY_FOR_ARCHS_REASON=	uses hard-coded SSE instructions

 USES=		gmake
 USE_GITHUB=	yes
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	ncbi-blast+
 DISTVERSION=	2.12.0
+PORTREVISION=	1
 CATEGORIES=	biology perl5 python
 MASTER_SITES=	https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \
 		https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/
--- a/biology/py-resdk/Makefile
+++ b/biology/py-resdk/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	resdk
-DISTVERSION=	13.4.0
+DISTVERSION=	13.6.0
 CATEGORIES=	biology python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/biology/py-resdk/distinfo
+++ b/biology/py-resdk/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1629201023
-SHA256 (resdk-13.4.0.tar.gz) = 28906c064e8aa975563cf592f928f96c2a9f2328be9ad7d70560e8c02572a74f
-SIZE (resdk-13.4.0.tar.gz) = 226889
+TIMESTAMP = 1634874558
+SHA256 (resdk-13.6.0.tar.gz) = 67b31cd6f65f67cbf7a262c2822159ced242f7c887148cadc760f303c1f72cea
+SIZE (resdk-13.6.0.tar.gz) = 229263
--- a/biology/trimadap/Makefile
+++ b/biology/trimadap/Makefile
@ -9,7 +9,7 @@ COMMENT=	Trim adapter sequences from Illumina data using heuristic rules
 LICENSE=	GPLv2

 ONLY_FOR_ARCHS=		amd64 i386 powerpc64le
-ONLY_FOR_ARCHS_REASON=	Hard-coded SSE instructions
+ONLY_FOR_ARCHS_REASON=	uses hard-coded SSE instructions

 USE_GITHUB=	yes
 GH_ACCOUNT=	lh3
--- a/biology/ucsc-userapps/Makefile
+++ b/biology/ucsc-userapps/Makefile
@ -19,7 +19,7 @@ LICENSE_TEXT=	Some tools installed by this port require a license for\
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell

 ONLY_FOR_ARCHS=		amd64
-ONLY_FOR_ARCHS_REASON=	_mm_popcnt_u64
+ONLY_FOR_ARCHS_REASON=	uses _mm_popcnt_u64() function

 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libiconv.so:converters/libiconv \
--- a/biology/vsearch/Makefile
+++ b/biology/vsearch/Makefile
@ -1,7 +1,7 @@
-PORTNAME=		vsearch
+PORTNAME=	vsearch
 DISTVERSIONPREFIX=	v
-DISTVERSION=		2.17.1
-CATEGORIES=		biology
+DISTVERSION=	2.17.1
+CATEGORIES=	biology

 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Versatile open-source tool for metagenomics
@ -10,7 +10,7 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

 ONLY_FOR_ARCHS=		aarch64 amd64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	Explicitly enumerated by upstream developers
+ONLY_FOR_ARCHS_REASON=	explicitly enumerated by upstream developers

 LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo

--- a/cad/calculix-ccx/Makefile
+++ b/cad/calculix-ccx/Makefile
@ -1,8 +1,7 @@
 # Created by: Pedro Giffuni

 PORTNAME=	ccx
-PORTVERSION=	2.17
-PORTREVISION=	2
+PORTVERSION=	2.18
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 PKGNAMEPREFIX=	CalculiX-
--- a/cad/calculix-ccx/distinfo
+++ b/cad/calculix-ccx/distinfo
@ -1,9 +1,9 @@
-TIMESTAMP = 1597089998
-SHA256 (calculix/ccx_2.17.src.tar.bz2) = ca708ad4aa729d9f84a9faba343c1bcc0b7cc84ed372616ebb55c8e6fa8f6e50
-SIZE (calculix/ccx_2.17.src.tar.bz2) = 1503269
-SHA256 (calculix/ccx_2.17.htm.tar.bz2) = 1af8f5e48d5a09637428e69a606fbd21beb719ab3dda9ff8ffed7545e15d6dcc
-SIZE (calculix/ccx_2.17.htm.tar.bz2) = 2658834
-SHA256 (calculix/ccx_2.17.ps.tar.bz2) = 41ec913a759c7f8da618c62278c1bf9dda89b7ad4fbe22289aff5a8647a1830d
-SIZE (calculix/ccx_2.17.ps.tar.bz2) = 4126329
-SHA256 (calculix/ccx_2.17.test.tar.bz2) = 798f94e536197bb10a74bae096f2a29a5111239020e7d10f93e1ad3d90c370cf
-SIZE (calculix/ccx_2.17.test.tar.bz2) = 12396359
+TIMESTAMP = 1634866888
+SHA256 (calculix/ccx_2.18.src.tar.bz2) = fad533bd66693daa398856262bf7c6feb12599c3051955238b0a70420852ff65
+SIZE (calculix/ccx_2.18.src.tar.bz2) = 1593157
+SHA256 (calculix/ccx_2.18.htm.tar.bz2) = 5b9cc5e6a1ef70bd93737b507cb754d485b229ec3cef31ea33501a74deff23e6
+SIZE (calculix/ccx_2.18.htm.tar.bz2) = 2586160
+SHA256 (calculix/ccx_2.18.ps.tar.bz2) = 6754f63a7df7bb32a2a065fa7cd576bdc6db9fcc8944c7c102da26ac77734740
+SIZE (calculix/ccx_2.18.ps.tar.bz2) = 5148638
+SHA256 (calculix/ccx_2.18.test.tar.bz2) = c5f771fc152d876366570b0d88032d908d912efb566ccddf070184acceeed7f4
+SIZE (calculix/ccx_2.18.test.tar.bz2) = 9759177
--- a/cad/calculix-ccx/files/patch-Makefile
+++ b/cad/calculix-ccx/files/patch-Makefile
@ -1,4 +1,4 @@
--- Makefile.orig	2020-07-23 19:41:38 UTC
+--- Makefile.orig	2021-09-15 19:39:24 UTC
 +++ Makefile
@@ -1,9 +1,9 @@
 
@ -24,9 +24,9 @@
 +       -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
 +       -lpthread -lm
 
- ccx_2.17: $(OCCXMAIN) ccx_2.17.a  $(LIBS)
-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS)
-+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS)
+ ccx_2.18: $(OCCXMAIN) ccx_2.18.a  $(LIBS)
+-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.18.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.18.a $(LIBS) -fopenmp
+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.18.c; $(FC) -o $@ $(OCCXMAIN) ccx_2.18.a $(LIBS) -fopenmp
 
- ccx_2.17.a: $(OCCXF) $(OCCXC)
+ ccx_2.18.a: $(OCCXF) $(OCCXC)
 	ar vr $@ $?
--- a/cad/calculix-ccx/files/patch-date.pl
+++ b/cad/calculix-ccx/files/patch-date.pl
@ -1,4 +1,4 @@
--- date.pl.orig	2020-07-23 19:41:38 UTC
+--- date.pl.orig	2021-09-15 19:39:24 UTC
 +++ date.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/env perl
@ -7,5 +7,5 @@
 +use POSIX qw(strftime);
 +chomp(my $date = strftime("%Y-%m-%d", gmtime($ENV{SOURCE_DATE_EPOCH} || time)));
 
- # inserting the date into ccx_2.17.c
+ # inserting the date into ccx_2.18.c
 
--- a/cad/calculix-ccx/pkg-plist
+++ b/cad/calculix-ccx/pkg-plist
@ -1715,265 +1715,31 @@ bin/ccx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img2539.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img254.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img2540.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2541.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2542.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2543.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2544.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2545.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2546.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2547.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2548.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2549.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img255.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2550.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2551.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2552.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2553.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2554.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2555.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2556.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2557.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2558.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2559.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img256.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2560.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2561.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2562.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2563.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2564.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2565.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2566.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2567.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2568.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2569.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img257.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2570.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2571.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2572.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2573.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2574.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2575.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2576.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2577.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2578.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2579.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img258.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2580.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2581.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2582.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2583.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2584.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2585.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2586.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2587.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2588.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2589.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img259.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2590.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2591.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2592.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2593.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2594.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2595.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2596.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2597.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2598.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2599.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img26.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img260.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2600.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2601.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2602.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2603.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2604.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2605.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2606.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2607.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2608.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2609.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img261.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2610.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2611.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2612.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2613.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2614.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2615.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2616.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2617.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2618.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2619.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img262.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2620.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2621.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2622.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2623.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2624.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2625.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2626.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2627.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2628.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2629.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img263.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2630.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2631.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2632.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2633.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2634.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2635.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2636.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2637.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2638.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2639.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img264.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2640.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2641.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2642.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2643.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2644.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2645.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2646.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2647.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2648.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2649.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img265.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2650.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2651.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2652.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2653.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2654.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2655.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2656.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2657.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2658.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2659.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img266.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2660.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2661.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2662.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2663.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2664.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2665.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2666.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2667.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2668.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2669.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img267.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2670.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2671.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2672.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2673.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2674.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2675.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2676.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2677.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2678.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2679.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img268.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2680.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2681.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2682.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2683.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2684.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2685.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2686.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2687.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2688.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2689.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img269.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2690.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2691.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2692.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2693.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2694.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2695.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2696.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2697.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2698.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2699.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img27.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img270.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2700.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2701.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2702.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2703.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2704.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2705.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2706.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2707.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2708.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2709.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img271.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2710.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2711.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2712.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2713.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2714.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2715.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2716.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2717.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2718.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2719.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img272.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2720.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2721.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2722.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2723.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2724.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2725.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2726.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2727.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2728.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2729.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img273.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2730.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2731.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2732.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2733.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2734.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2735.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2736.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2737.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2738.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2739.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img274.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2740.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2741.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2742.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2743.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2744.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2745.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2746.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2747.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2748.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2749.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img275.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2750.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2751.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2752.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2753.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2754.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2755.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2756.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2757.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2758.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2759.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img276.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2760.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2761.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2762.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2763.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2764.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2765.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2766.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2767.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2768.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2769.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img277.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2770.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2771.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2772.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2773.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2774.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img278.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img279.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img28.png
@ -3206,39 +2972,10 @@ bin/ccx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node484.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node485.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node486.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node487.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node488.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node489.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node49.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node490.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node491.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node492.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node493.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node494.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node495.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node496.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node497.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node498.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node499.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node5.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node50.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node500.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node501.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node502.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node503.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node504.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node505.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node506.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node507.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node508.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node509.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node51.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node510.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node511.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node512.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node513.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node514.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node515.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node52.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node53.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node54.html
@ -3291,7 +3028,7 @@ bin/ccx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx_2.17.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_2.18.ps.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel29.dat.ref
@ -3398,6 +3135,8 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamd.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamd2.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamd2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamd3.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamd3.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdelay.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdelay.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy1.dat.ref
@ -3447,6 +3186,8 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy9.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic2.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic2.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamexpdy1.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamexpdy1.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf.dat.ref
@ -3601,6 +3342,8 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo4.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo5.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo5.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo6.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo6.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamprand.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamprand.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamprand.inp
@ -3645,6 +3388,7 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamstraight.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamstraight.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt2.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt2.inp
@ -3738,6 +3482,9 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/channel7.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/channel9.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/channel9.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/channelcbs.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/channelcbs.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/channelcbs.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chanson1.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chanson1.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/characteristic.dat.ref
@ -3745,12 +3492,10 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.rfn.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.rfn.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pcent.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pcent.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pcent.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pcent.rfn.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pcent.rfn.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compare
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compare_valgrind_leaks
@ -3792,36 +3537,27 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contdamp1.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contdamp2.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contdamp2.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2d.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2d.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2dfem.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2dfem.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucss.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucss.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couctr.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couctr.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucyl.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucyl.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucyl.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcent.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcent.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcent2.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcent2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcentcomp.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcentcomp.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcentcomp.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcomp.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcomp.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcomp.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1fem.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1fem.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette2.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette2.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette2fem.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette2fem.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette5fem.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette5fem.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcent.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcent.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette5.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette5.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling1.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling1.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling2.dat.ref
@ -3836,6 +3572,27 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling6.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling7.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling7.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg2.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg2.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg3.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg3.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg3.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cousegcomp.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cousegcomp.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cousegcomp.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIcum.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIcum.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIcum.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIint.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIint.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIint.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIprin.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIprin.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIprin.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube2.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube2.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubef2f1.dat.ref
@ -3911,13 +3668,10 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidread.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidread.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidread.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidwrite.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidwrite.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidwrite.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/frdcheck.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freq_test.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freq_test.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freq_test.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.inp
@ -4062,6 +3816,21 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/leifer2.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/leifer2.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/leifer2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_cooks_beam_128.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_cooks_beam_128.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_cooks_beam_128.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_initial_temp_condition.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_initial_temp_condition.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_initial_temp_condition.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_pres_load.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_pres_load.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_pres_load.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_th_gradient.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_th_gradient.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_th_gradient.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_twisted_beam.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_twisted_beam.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_twisted_beam.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/linearnet.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/linearnet.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/load1.dat.ref
@ -4074,6 +3843,7 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mass3.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/massflow_percent_ccx.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/massflow_percent_ccx.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/masterII.frd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane1.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane1.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane1.inp
@ -4110,6 +3880,8 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20cf.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20df.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20df.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20df2.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20df2.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi2.dat.ref
@ -4171,18 +3943,8 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestress4.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestress4.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestress4.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestressquadsens.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestressquadsens.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestressquadsens.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestresssens.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestresssens.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestresssens.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plate.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plate.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poi2d.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poi2d.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poi2d2.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poi2d2.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/potied.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/potied.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret1.dat.ref
@ -4313,6 +4075,10 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth.rfn.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth2.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth2.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth2.rfn.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmenttet.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmenttet.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentunsmooth.dat.ref
@ -4320,9 +4086,6 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentunsmooth.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segststate.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segststate.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens2d.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens2d.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens2d.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens3d.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens3d.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens3d.inp
@ -4338,6 +4101,9 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_freq_orien.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_freq_orien.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_freq_orien.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_modalstress.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_modalstress.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_modalstress.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sensitivity_I.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sensitivity_I.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sensitivity_I.inp
@ -4388,12 +4154,6 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellf2.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellnor.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellnor.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellquadsens.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellquadsens.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellquadsens.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellsens.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellsens.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellsens.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeam.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeam.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeam.inp
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@ -1,8 +1,7 @@
 # Created by: Pedro Giffuni

 PORTNAME=	calculix
-PORTVERSION=	2.17.1
-PORTREVISION=	1
+PORTVERSION=	2.18
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@ -1,9 +1,9 @@
-TIMESTAMP = 1600795203
-SHA256 (calculix/cgx_2.17.1.all.tar.bz2) = 3fcd2ec59fd65e3b51cacf4c6ace21bf36570ea4527ba9840e52c96736c4dc0f
-SIZE (calculix/cgx_2.17.1.all.tar.bz2) = 5785730
-SHA256 (calculix/cgx_2.17.1.exa.tar.bz2) = 6aab76b368155933fa6894aacc27499f64e15534f4d34ea6810b1697a14bc825
-SIZE (calculix/cgx_2.17.1.exa.tar.bz2) = 3919545
-SHA256 (calculix/cgx_2.17.1.htm.tar.bz2) = 907a508856e3e5593f451facfdfa1cdfdc303b632165b7a20e8f7a566b57e36d
-SIZE (calculix/cgx_2.17.1.htm.tar.bz2) = 370298
-SHA256 (calculix/cgx_2.17.1.pdf) = f47918ccf3c041acb933ee45e112e58250547a6dde7ac649e9fa6d9ea7613527
-SIZE (calculix/cgx_2.17.1.pdf) = 1197112
+TIMESTAMP = 1634869635
+SHA256 (calculix/cgx_2.18.all.tar.bz2) = dea36f02f36f35a420241b8ed9836f0121b75b5af1abb8e13ca48e31dc4f8734
+SIZE (calculix/cgx_2.18.all.tar.bz2) = 5749856
+SHA256 (calculix/cgx_2.18.exa.tar.bz2) = 498d239ae77be8f3f5d1f48acc431724dd297a246755bfb651dcbc03ba233873
+SIZE (calculix/cgx_2.18.exa.tar.bz2) = 3921273
+SHA256 (calculix/cgx_2.18.htm.tar.bz2) = 486ce50880cb0c298f6ccdde353bc8982bfb095294a7404eb966b3345d790312
+SIZE (calculix/cgx_2.18.htm.tar.bz2) = 377755
+SHA256 (calculix/cgx_2.18.pdf) = 2ee1f644fc8747bf2a1af1ad093251db736e6836fa695e7eb87745447e2bf62d
+SIZE (calculix/cgx_2.18.pdf) = 1476039
--- a/cad/calculix/files/patch-cgx__2.18_src_pickFunktions.c
+++ b/cad/calculix/files/patch-cgx__2.18_src_pickFunktions.c
@ -0,0 +1,11 @@
+--- cgx_2.18/src/pickFunktions.c.orig	2021-09-18 09:40:04 UTC
+++ cgx_2.18/src/pickFunktions.c
+@@ -4594,7 +4594,7 @@ void moveLineEndPoint(int lineNr, int pntNr, double ll
+     else
+     {
+       printf("ERROR: selected point:%s is no line endpoint\n", point[pntNr].name);
+-      return(-1);
+      return;
+     }
+     u=flag*llength;
+     u/=scale->w;
--- a/cad/calculix/files/patch-cgx__VER_src_Makefile
+++ b/cad/calculix/files/patch-cgx__VER_src_Makefile
@ -1,5 +1,5 @@
--- cgx_2.17.1/src/Makefile.orig	2020-02-18 18:22:00 UTC
-+++ cgx_2.17.1/src/Makefile
+--- cgx_2.18/src/Makefile.orig	2021-03-11 17:35:46 UTC
+++ cgx_2.18/src/Makefile
@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing \
   -I/usr/include/GL \
   -I../../libSNL/src \
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@ -1,8 +1,10 @@
 bin/cgx
+%%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.aux
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.log
+%%PORTDOCS%%%%DOCSDIR%%/cgx/images.out
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.pl
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.tex
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img1.png
@ -236,7 +238,12 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node265.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node266.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node267.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node268.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node269.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node270.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node271.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node272.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node29.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node3.html
@ -316,7 +323,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.17.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.18.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
@ -344,7 +351,6 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/Allrun
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/RASProperties
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/boundary
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/couette.fbb
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/couette.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/faces
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/neighbour
@ -366,6 +372,10 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_penta.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/duns.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/duns.hdr
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/duns.trl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/rae2822.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/disc.fbd
@ -392,6 +402,7 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dolfyn/mirror/spiegel.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/geometry.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.12d
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/send.fbl
@ -404,6 +415,7 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map3D.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/pressure.bak
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.12d
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/hcpy_1.png
@ -411,17 +423,17 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/result.frd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solverfile.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.12d
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.12d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/post.fbl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/send.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/latimtrans.12d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/latimtrans.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/post.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/send.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.12d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbb
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@ -64,9 +64,6 @@ NONE_DESC=	No GUI support
 NONE_CONFIGURE_ON=	--without-gui
 NONE_CONFIGURE_ENV=	WISH=/usr/bin/true

-ONLY_FOR_ARCHS=	i386 amd64
-ONLY_FOR_ARCHS_REASON=	Uses x86 specific libc functions and has not been ported
-
 DOCS_INFO=		pcb

 .include <bsd.port.mk>
--- a/cad/pcb/files/patch-gts_rounding.h
+++ b/cad/pcb/files/patch-gts_rounding.h
@ -0,0 +1,16 @@
+--- gts/rounding.h.orig	Mon Jun 17 12:05:45 2002
+++ gts/rounding.h	Wed Sep 24 12:57:41 2003
+@@ -28,11 +28,11 @@
+                              _FPU_SETCW(fpu_round_double); }
+ #  define FPU_RESTORE       {_FPU_SETCW(fpu_init);}
+ #else /* not HAVE_FPU_CONTROL_H */
+-#  ifdef __FreeBSD__
+#  ifdef HAVE_FROATINGPOINT_H
+ #    include <floatingpoint.h>
+ #    define FPU_ROUND_DOUBLE  (fpsetprec(FP_PD))
+ #    define FPU_RESTORE       (fpsetprec(FP_PE))
+-#  else /* not __FreeBSD__ */
+#  else /* not HAVE_FROATINGPOINT_H */
+ #    ifdef WIN32
+ #      ifdef _MSC_VER
+ #        include <float.h>
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	fldigi
 DISTVERSION=	4.1.20
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/files/fldigi/

@ -28,7 +29,7 @@ USE_XORG=	x11 xft xext xfixes xcursor xinerama xrender
 CONFIGURE_ENV=	FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \
 		    EXTRA_LIBS="-lexecinfo"

-OPTIONS_DEFINE=	NATIVE_OPT FLARQ OSS PULSEAUDIO HAMLIB NLS DOCS
+OPTIONS_DEFINE=	FLARQ OSS PULSEAUDIO HAMLIB NLS DOCS

 NATIVE_OPT_DESC=	Enable Native Optimizations
 FLARQ_DESC=		Compile flarq
--- a/comms/py-hidapi/Makefile
+++ b/comms/py-hidapi/Makefile
@ -1,8 +1,7 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>

 PORTNAME=	hidapi
-PORTVERSION=	0.10.1
-PORTREVISION=	1
+DISTVERSION=	0.11.0.post2
 CATEGORIES=	comms python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -17,6 +16,8 @@ LIB_DEPENDS=	libhidapi.so:comms/hidapi
 USES=		python:3.6+
 USE_PYTHON=	autoplist cython distutils

+MAKE_ENV+=	DISTUTILS_DEBUG=1
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|usb-1.0|usb|g' ${WRKSRC}/setup.py

--- a/comms/py-hidapi/distinfo
+++ b/comms/py-hidapi/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1608889036
-SHA256 (hidapi-0.10.1.tar.gz) = a1170b18050bc57fae3840a51084e8252fd319c0fc6043d68c8501deb0e25846
-SIZE (hidapi-0.10.1.tar.gz) = 60712
+TIMESTAMP = 1634926262
+SHA256 (hidapi-0.11.0.post2.tar.gz) = da815e0d1d4b2ef1ebbcc85034572105dca29627eb61881337aa39010f2ef8cb
+SIZE (hidapi-0.11.0.post2.tar.gz) = 136467
--- a/comms/syncterm/Makefile
+++ b/comms/syncterm/Makefile
@ -42,6 +42,6 @@ SDL_MAKE_ARGS=	USE_SDL=1
 SDL_MAKE_ARGS_OFF=	WITHOUT_SDL=1

 ONLY_FOR_ARCHS=		i386 amd64 powerpc powerpc64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	does not configure except on i386, amd64 and powerpc*
+ONLY_FOR_ARCHS_REASON=	does not configure except on i386, amd64, and powerpc*

 .include <bsd.port.mk>
--- a/converters/cl-babel-sbcl/Makefile
+++ b/converters/cl-babel-sbcl/Makefile
@ -8,14 +8,12 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Charset encoding/decoding library written in Common Lisp

-BROKEN=		does not build: depends on file: /usr/local/lib/common-lisp/alexandria/sbclfasl/arrays.fasl - not found
-
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/babel/babel.asd:converters/cl-babel \
-		${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/sbclfasl/arrays.fasl:devel/cl-alexandria-sbcl \
+		${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/sbclfasl/alexandria-1/arrays.fasl:devel/cl-alexandria-sbcl \
 		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/sbclfasl/src/tf-sbcl.fasl:devel/cl-trivial-features-sbcl \
 		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/sbclfasl/package.fasl:devel/cl-trivial-gray-streams-sbcl
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/babel/babel.asd:converters/cl-babel \
-		${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/sbclfasl/arrays.fasl:devel/cl-alexandria-sbcl \
+		${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/sbclfasl/alexandria-1/arrays.fasl:devel/cl-alexandria-sbcl \
 		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/sbclfasl/src/tf-sbcl.fasl:devel/cl-trivial-features-sbcl \
 		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/sbclfasl/package.fasl:devel/cl-trivial-gray-streams-sbcl

--- a/converters/p5-Encode/Makefile
+++ b/converters/p5-Encode/Makefile
@ -1,7 +1,7 @@
 # Created by: Rong-En Fan <rafan@infor.org>

 PORTNAME=	Encode
-PORTVERSION=	3.14
+PORTVERSION=	3.16
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DANKOGAI
--- a/converters/p5-Encode/distinfo
+++ b/converters/p5-Encode/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1634111674
-SHA256 (Encode-3.14.tar.gz) = a9c48f30ffc785c07e0db8a803074109ff3ffe979af6e1a6769741ca7f587776
-SIZE (Encode-3.14.tar.gz) = 2056480
+TIMESTAMP = 1635181009
+SHA256 (Encode-3.16.tar.gz) = e5e91d98a97de70dccecc2a25d049a0b5f5f12228c618680020d73043355294c
+SIZE (Encode-3.16.tar.gz) = 2056783
--- a/converters/py-zfec/Makefile
+++ b/converters/py-zfec/Makefile
@ -22,6 +22,6 @@ USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils

 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/zfec/_fec*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +

 .include <bsd.port.mk>
--- a/converters/rubygem-base64/Makefile
+++ b/converters/rubygem-base64/Makefile
@ -1,7 +1,7 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>

 PORTNAME=	base64
-PORTVERSION=	0.1.0
+PORTVERSION=	0.1.1
 CATEGORIES=	converters rubygems
 MASTER_SITES=	RG

--- a/converters/rubygem-base64/distinfo
+++ b/converters/rubygem-base64/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1609598769
-SHA256 (rubygem/base64-0.1.0.gem) = 1ca71300b558526985142329759b79f03fecaf7c0f7cf8b2c7721c6f2c30105e
-SIZE (rubygem/base64-0.1.0.gem) = 8192
+TIMESTAMP = 1634391184
+SHA256 (rubygem/base64-0.1.1.gem) = 0c75d351a429b5176a476cd8a3740cff3277d2bac26a50b5c7456c266e9acd33
+SIZE (rubygem/base64-0.1.1.gem) = 7168
--- a/databases/Makefile
+++ b/databases/Makefile
@ -880,7 +880,6 @@
    SUBDIR += rubygem-activemodel52
    SUBDIR += rubygem-activemodel60
    SUBDIR += rubygem-activemodel61
-    SUBDIR += rubygem-activemodel613
    SUBDIR += rubygem-activerecord-explain-analyze
    SUBDIR += rubygem-activerecord-import
    SUBDIR += rubygem-activerecord-jdbc-adapter
@ -892,7 +891,6 @@
    SUBDIR += rubygem-activerecord52
    SUBDIR += rubygem-activerecord60
    SUBDIR += rubygem-activerecord61
-    SUBDIR += rubygem-activerecord613
    SUBDIR += rubygem-after_commit_queue
    SUBDIR += rubygem-amalgalite
    SUBDIR += rubygem-arel
@ -972,6 +970,7 @@
    SUBDIR += rubygem-puppetdb_cli
    SUBDIR += rubygem-rbase
    SUBDIR += rubygem-redis
+    SUBDIR += rubygem-redis44
    SUBDIR += rubygem-redis-actionpack
    SUBDIR += rubygem-redis-actionpack-rails5
    SUBDIR += rubygem-redis-actionpack-rails50
--- a/databases/R-cran-RPostgreSQL/Makefile
+++ b/databases/R-cran-RPostgreSQL/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	RPostgreSQL
-DISTVERSION=	0.7-2
+DISTVERSION=	0.7-3
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${DISTVERSION}

--- a/databases/R-cran-RPostgreSQL/distinfo
+++ b/databases/R-cran-RPostgreSQL/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1633826894
-SHA256 (RPostgreSQL_0.7-2.tar.gz) = 444bbf93d8cce774bc48ca59a372fdcf31265c7c8492e89011fca457dc4b2df3
-SIZE (RPostgreSQL_0.7-2.tar.gz) = 580969
+TIMESTAMP = 1634909121
+SHA256 (RPostgreSQL_0.7-3.tar.gz) = bdbca10329aeb357f05364772964716dfb5ce2470f7eb4a33770862b6ded71b9
+SIZE (RPostgreSQL_0.7-3.tar.gz) = 580771
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	arrow
 DISTVERSION=	4.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
 		https://github.com/apache/orc/archive/rel/:orc
--- a/databases/clickhouse/Makefile
+++ b/databases/clickhouse/Makefile
@ -12,7 +12,7 @@ COMMENT=	Fast open-source OLAP database management system
 LICENSE=	APACHE20

 ONLY_FOR_ARCHS=	amd64
-ONLY_FOR_ARCHS_REASON=	"Only supported on amd64"
+ONLY_FOR_ARCHS_REASON=	only supported on amd64

 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	bash:shells/bash
--- a/databases/cockroach/Makefile
+++ b/databases/cockroach/Makefile
@ -12,7 +12,7 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/src/github.com/cockroachdb/cockroach/LICENSE

 ONLY_FOR_ARCHS=	amd64
-ONLY_FOR_ARCHS_REASON=	"A 64-bit system is strongly recommended"
+ONLY_FOR_ARCHS_REASON=	64-bit system is strongly recommended

 BUILD_DEPENDS=	autoconf:devel/autoconf \
 		bash:shells/bash \
--- a/Show More
+++ b/Show More