Index: head/audio/faust/Makefile
===================================================================
--- head/audio/faust/Makefile
+++ head/audio/faust/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	faust
-DISTVERSIONPREFIX=	v
-DISTVERSION=	2-5-10
+DISTVERSION=	2.5.17
 CATEGORIES=	audio devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -12,16 +11,16 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libLLVM-${LLVM_VERSION_P}.so:devel/llvm${LLVM_VERSION}
+LIB_DEPENDS=	libLLVM-${LLVM_VERSION:C/([1-9])([0-9])/\1.\2/}.so:devel/llvm${LLVM_VERSION}
 
 USES=		gmake ncurses python pkgconfig shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	grame-cncm
-GH_TUPLE=	ThatOtherPerson:xxd:cd8ecce:x/xxd-replacement
+GH_TUPLE=	grame-cncm:faustlibraries:f889fe1:libs/libraries \
+		ThatOtherPerson:xxd:cd8ecce:xxd/xxd-replacement
 USE_CXXSTD=	c++11
 SHEBANG_FILES=	tools/faust2appls/* tools/benchmark/faustbench
-LLVM_VERSION=	34 # llvm-4.0 and 3.9 fail, see bug#220454
-LLVM_VERSION_P=	${LLVM_VERSION:C/([1-9])([0-9])/\1.\2/}
+LLVM_VERSION=	50
 MAKE_ENV=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VERSION}
 
 OPTIONS_DEFINE=	HIGHLIGHT HTTPD_LIB
@@ -35,7 +34,7 @@
 
 # Fix of the upstream bug https://github.com/grame-cncm/faust/issues/76 will kill most of the patches.
 post-patch:
-	@${REINPLACE_CMD} -i '' -e 's|make -C|$$(MAKE) -C|' \
+	@${REINPLACE_CMD} -i '' -e 's|make -C|$$(MAKE) -C| ; s|share/man|man|g' \
 		${WRKSRC}/Makefile \
 		${WRKSRC}/architecture/osclib/Makefile
 	@${REINPLACE_CMD} -i '' -e 's| -O1|| ; s|-o faust|-lexecinfo -o faust|' \
@@ -82,14 +81,13 @@
 	@${REINPLACE_CMD} -i '' "s|xxd|${WRKSRC}/xxd-replacement/xxd|" \
 		${WRKSRC}/compiler/Makefile.unix \
 		${WRKSRC}/architecture/httpdlib/src/Makefile
-	@${REINPLACE_CMD} -i '' "s|cp libraries/old/|#cp libraries/old/| ; s|cp libraries/\*\.lib|#cp libraries/*.lib|" \
-		${WRKSRC}/Makefile
 
 pre-build:
 	cd ${WRKSRC}/xxd-replacement && ${MAKE_CMD}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/faust
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/faust # https://github.com/grame-cncm/faust/issues/135
 
 post-install-HIGHLIGHT-on:
 	# 1) kate
Index: head/audio/faust/distinfo
===================================================================
--- head/audio/faust/distinfo
+++ head/audio/faust/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1513738144
-SHA256 (grame-cncm-faust-v2-5-10_GH0.tar.gz) = f55c04c6f80c41ae42b0cf98156be8e1c340d7284584312095b89175592a7105
-SIZE (grame-cncm-faust-v2-5-10_GH0.tar.gz) = 41959487
+TIMESTAMP = 1517983768
+SHA256 (grame-cncm-faust-2.5.17_GH0.tar.gz) = 8c4a96d3761fb432f1a236b2d11964242e5e30cd6d5634370ff8d6a5fdea87c8
+SIZE (grame-cncm-faust-2.5.17_GH0.tar.gz) = 41099161
+SHA256 (grame-cncm-faustlibraries-f889fe1_GH0.tar.gz) = 39f8b2825686993574e326b78ad543634a3b7559343575e66927d14c33885bc6
+SIZE (grame-cncm-faustlibraries-f889fe1_GH0.tar.gz) = 6080548
 SHA256 (ThatOtherPerson-xxd-cd8ecce_GH0.tar.gz) = 47e60f554a4a3c403146215cd2811be105c29e5e2fd48a077330c770b137a6d0
 SIZE (ThatOtherPerson-xxd-cd8ecce_GH0.tar.gz) = 11304
Index: head/audio/faust/pkg-plist
===================================================================
--- head/audio/faust/pkg-plist
+++ head/audio/faust/pkg-plist
@@ -48,6 +48,7 @@
 bin/faust2pdf
 bin/faust2plot
 bin/faust2png
+bin/faust2pure
 bin/faust2puredata
 bin/faust2raqt
 bin/faust2ros
@@ -110,6 +111,7 @@
 include/faust/dsp/libfaust.h
 include/faust/dsp/llvm-c-dsp.h
 include/faust/dsp/llvm-dsp.h
+include/faust/dsp/poly-dsp-tools.h
 include/faust/dsp/poly-dsp.h
 include/faust/dsp/proxy-dsp.h
 include/faust/dsp/remote-dsp.h
@@ -180,9 +182,10 @@
 include/faust/vst/faust.h
 include/faust/vst/voice.h
 include/faust/vst/vstui.h
-lib/libHTTPDFaust.a
+%%HTTPD_LIB%%lib/libHTTPDFaust.a
 lib/libOSCFaust.a
 lib/libfaust.a
+man/man1/faust.1.gz
 %%DATADIR%%/AU/AUPublic/AUBase/AUBase.cpp
 %%DATADIR%%/AU/AUPublic/AUBase/AUBase.h
 %%DATADIR%%/AU/AUPublic/AUBase/AUDispatch.cpp
@@ -276,9 +279,11 @@
 %%DATADIR%%/AU/Source/CocoaUI/FaustAU_Slider.m
 %%DATADIR%%/AU/version.plist
 %%DATADIR%%/alchemy-as.cpp
+%%DATADIR%%/all.lib
 %%DATADIR%%/alsa-console.cpp
 %%DATADIR%%/alsa-gtk.cpp
 %%DATADIR%%/alsa-qt.cpp
+%%DATADIR%%/analyzers.lib
 %%DATADIR%%/android/README.md
 %%DATADIR%%/android/android.iml
 %%DATADIR%%/android/app/CMakeLists.txt
@@ -443,21 +448,31 @@
 %%DATADIR%%/api/doc/iOS.md
 %%DATADIR%%/au-effect.cpp
 %%DATADIR%%/au-instrument.cpp
+%%DATADIR%%/basics.lib
 %%DATADIR%%/bela.cpp
 %%DATADIR%%/bench.cpp
 %%DATADIR%%/c-jack-gtk.c
 %%DATADIR%%/ca-qt.cpp
+%%DATADIR%%/compressors.lib
 %%DATADIR%%/csound.cpp
+%%DATADIR%%/delays.lib
+%%DATADIR%%/demos.lib
 %%DATADIR%%/dssi.cpp
 %%DATADIR%%/dummy-mem.cpp
 %%DATADIR%%/dummy.cpp
+%%DATADIR%%/dx7.lib
+%%DATADIR%%/effect.lib
+%%DATADIR%%/envelopes.lib
 %%DATADIR%%/faust-llvm.cpp
 %%DATADIR%%/faust-netjack-gtk.cpp
 %%DATADIR%%/faustbench.cpp
 %%DATADIR%%/faustui.js
 %%DATADIR%%/faustvst.cpp
 %%DATADIR%%/faustvstqt.h
+%%DATADIR%%/filter.lib
+%%DATADIR%%/filters.lib
 %%DATADIR%%/gen-json.cpp
+%%DATADIR%%/hoa.lib
 %%DATADIR%%/iOS-bench/faustbench.xcodeproj/project.pbxproj
 %%DATADIR%%/iOS-bench/faustbench.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 %%DATADIR%%/iOS-bench/faustbench/AppDelegate.h
@@ -584,6 +599,7 @@
 %%DATADIR%%/iOS/pix/jackview-out.png
 %%DATADIR%%/iOS/pix/jackview-out@2x.png
 %%DATADIR%%/iOSKeyboard.cpp
+%%DATADIR%%/instruments.lib
 %%DATADIR%%/ios-coreaudio-jack.cpp
 %%DATADIR%%/ios-coreaudio.cpp
 %%DATADIR%%/jack-console.cpp
@@ -600,8 +616,8 @@
 %%DATADIR%%/js/faustuihtml.js
 %%DATADIR%%/js/jdesc.js
 %%DATADIR%%/js/jquery-1.7.1.min.js
-%%DATADIR%%/js/jsscripts.js
-%%DATADIR%%/js/stylesheet.js
+%%HTTPD_LIB%%%%DATADIR%%/js/jsscripts.js
+%%HTTPD_LIB%%%%DATADIR%%/js/stylesheet.js
 %%DATADIR%%/js/svg/api/Makefile
 %%DATADIR%%/js/svg/api/make.bat
 %%DATADIR%%/js/svg/api/source/conf.py
@@ -647,17 +663,19 @@
 %%DATADIR%%/juce/standalone/standalone.jucer
 %%DATADIR%%/ladspa.cpp
 %%DATADIR%%/latexheader.tex
-%%DATADIR%%/libsndfile.a
 %%DATADIR%%/llvm-jack-gtk.cpp
 %%DATADIR%%/lv2.cpp
 %%DATADIR%%/lv2qtgui.h
 %%DATADIR%%/lv2ui.cpp
+%%DATADIR%%/math.lib
 %%DATADIR%%/mathdoctexts-de.txt
 %%DATADIR%%/mathdoctexts-default.txt
 %%DATADIR%%/mathdoctexts-en.txt
 %%DATADIR%%/mathdoctexts-fr.txt
 %%DATADIR%%/mathdoctexts-it.txt
+%%DATADIR%%/maths.lib
 %%DATADIR%%/matlabplot.cpp
+%%DATADIR%%/max-msp/README.md
 %%DATADIR%%/max-msp/faustgen-wrapper-poly.maxpat
 %%DATADIR%%/max-msp/faustgen-wrapper.maxpat
 %%DATADIR%%/max-msp/max-msp.cpp
@@ -665,14 +683,17 @@
 %%DATADIR%%/max-msp/ui.js
 %%DATADIR%%/max-msp/wrapper-poly.maxpat
 %%DATADIR%%/max-msp/wrapper.maxpat
+%%DATADIR%%/maxmsp.lib
 %%DATADIR%%/minimal-effect.cpp
 %%DATADIR%%/minimal-jack.rs
 %%DATADIR%%/minimal.c
 %%DATADIR%%/minimal.cpp
 %%DATADIR%%/minimal.rs
+%%DATADIR%%/misceffects.lib
 %%DATADIR%%/module.cpp
 %%DATADIR%%/mr-plot.cpp
 %%DATADIR%%/ms-jack-gtk.cpp
+%%DATADIR%%/music.lib
 %%DATADIR%%/netjack-console.cpp
 %%DATADIR%%/netjack-qt.cpp
 %%DATADIR%%/nodejs/DspFaustNode.cpp
@@ -680,8 +701,11 @@
 %%DATADIR%%/nodejs/README.md
 %%DATADIR%%/nodejs/binding.gyp
 %%DATADIR%%/nodejs/faust.cpp
+%%DATADIR%%/noises.lib
 %%DATADIR%%/octave.cpp
 %%DATADIR%%/old-scheduler.cpp
+%%DATADIR%%/oscillator.lib
+%%DATADIR%%/oscillators.lib
 %%DATADIR%%/oscio-gtk.cpp
 %%DATADIR%%/oscio-qt.cpp
 %%DATADIR%%/osclib/Makefile
@@ -702,48 +726,30 @@
 %%DATADIR%%/osclib/faust/faust/osc/MessageProcessor.h
 %%DATADIR%%/osclib/faust/faust/osc/RootNode.h
 %%DATADIR%%/osclib/faust/faust/osc/smartpointer.h
-%%DATADIR%%/osclib/faust/libOSCFaust.a
 %%DATADIR%%/osclib/faust/license.txt
 %%DATADIR%%/osclib/faust/src/OSCControler.cpp
-%%DATADIR%%/osclib/faust/src/OSCControler.o
 %%DATADIR%%/osclib/faust/src/lib/OSCFError.cpp
 %%DATADIR%%/osclib/faust/src/lib/OSCFError.h
-%%DATADIR%%/osclib/faust/src/lib/OSCFError.o
 %%DATADIR%%/osclib/faust/src/lib/OSCRegexp.cpp
 %%DATADIR%%/osclib/faust/src/lib/OSCRegexp.h
-%%DATADIR%%/osclib/faust/src/lib/OSCRegexp.o
 %%DATADIR%%/osclib/faust/src/lib/deelx.h
 %%DATADIR%%/osclib/faust/src/msg/Message.cpp
-%%DATADIR%%/osclib/faust/src/msg/Message.o
 %%DATADIR%%/osclib/faust/src/nodes/FaustFactory.cpp
-%%DATADIR%%/osclib/faust/src/nodes/FaustFactory.o
 %%DATADIR%%/osclib/faust/src/nodes/FaustNode.cpp
-%%DATADIR%%/osclib/faust/src/nodes/FaustNode.o
 %%DATADIR%%/osclib/faust/src/nodes/MessageDriven.cpp
-%%DATADIR%%/osclib/faust/src/nodes/MessageDriven.o
 %%DATADIR%%/osclib/faust/src/nodes/RootNode.cpp
-%%DATADIR%%/osclib/faust/src/nodes/RootNode.o
 %%DATADIR%%/osclib/faust/src/osc/OSCAddress.cpp
 %%DATADIR%%/osclib/faust/src/osc/OSCAddress.h
-%%DATADIR%%/osclib/faust/src/osc/OSCAddress.o
 %%DATADIR%%/osclib/faust/src/osc/OSCIO.cpp
-%%DATADIR%%/osclib/faust/src/osc/OSCIO.o
 %%DATADIR%%/osclib/faust/src/osc/OSCListener.cpp
 %%DATADIR%%/osclib/faust/src/osc/OSCListener.h
-%%DATADIR%%/osclib/faust/src/osc/OSCListener.o
 %%DATADIR%%/osclib/faust/src/osc/OSCSetup.cpp
 %%DATADIR%%/osclib/faust/src/osc/OSCSetup.h
-%%DATADIR%%/osclib/faust/src/osc/OSCSetup.o
 %%DATADIR%%/osclib/faust/src/osc/OSCStream.cpp
 %%DATADIR%%/osclib/faust/src/osc/OSCStream.h
-%%DATADIR%%/osclib/faust/src/osc/OSCStream.o
 %%DATADIR%%/osclib/faust/src/threads/TThreads.h
 %%DATADIR%%/osclib/faust/src/threads/pthreads_impl.cpp
-%%DATADIR%%/osclib/faust/src/threads/pthreads_impl.o
 %%DATADIR%%/osclib/faust/src/threads/winthreads_impl.cpp
-%%DATADIR%%/osclib/faust/src/threads/winthreads_impl.o
-%%DATADIR%%/osclib/libOSCFaust.a
-%%DATADIR%%/osclib/liboscpack.a
 %%DATADIR%%/osclib/oscpack/CHANGES
 %%DATADIR%%/osclib/oscpack/LICENSE
 %%DATADIR%%/osclib/oscpack/Makefile
@@ -756,34 +762,26 @@
 %%DATADIR%%/osclib/oscpack/examples/SimpleSend.cpp
 %%DATADIR%%/osclib/oscpack/ip/IpEndpointName.cpp
 %%DATADIR%%/osclib/oscpack/ip/IpEndpointName.h
-%%DATADIR%%/osclib/oscpack/ip/IpEndpointName.o
 %%DATADIR%%/osclib/oscpack/ip/NetworkingUtils.h
 %%DATADIR%%/osclib/oscpack/ip/PacketListener.h
 %%DATADIR%%/osclib/oscpack/ip/TimerListener.h
 %%DATADIR%%/osclib/oscpack/ip/UdpSocket.h
 %%DATADIR%%/osclib/oscpack/ip/posix/NetworkingUtils.cpp
-%%DATADIR%%/osclib/oscpack/ip/posix/NetworkingUtils.o
 %%DATADIR%%/osclib/oscpack/ip/posix/UdpSocket.cpp
 %%DATADIR%%/osclib/oscpack/ip/posix/UdpSocket.cpp.orig
-%%DATADIR%%/osclib/oscpack/ip/posix/UdpSocket.o
-%%DATADIR%%/osclib/oscpack/liboscpack.a
 %%DATADIR%%/osclib/oscpack/make.MinGW32.bat
 %%DATADIR%%/osclib/oscpack/osc/MessageMappingOscPacketListener.h
 %%DATADIR%%/osclib/oscpack/osc/OscException.h
 %%DATADIR%%/osclib/oscpack/osc/OscHostEndianness.h
 %%DATADIR%%/osclib/oscpack/osc/OscOutboundPacketStream.cpp
 %%DATADIR%%/osclib/oscpack/osc/OscOutboundPacketStream.h
-%%DATADIR%%/osclib/oscpack/osc/OscOutboundPacketStream.o
 %%DATADIR%%/osclib/oscpack/osc/OscPacketListener.h
 %%DATADIR%%/osclib/oscpack/osc/OscPrintReceivedElements.cpp
 %%DATADIR%%/osclib/oscpack/osc/OscPrintReceivedElements.h
-%%DATADIR%%/osclib/oscpack/osc/OscPrintReceivedElements.o
 %%DATADIR%%/osclib/oscpack/osc/OscReceivedElements.cpp
 %%DATADIR%%/osclib/oscpack/osc/OscReceivedElements.h
-%%DATADIR%%/osclib/oscpack/osc/OscReceivedElements.o
 %%DATADIR%%/osclib/oscpack/osc/OscTypes.cpp
 %%DATADIR%%/osclib/oscpack/osc/OscTypes.h
-%%DATADIR%%/osclib/oscpack/osc/OscTypes.o
 %%DATADIR%%/osclib/oscpack/tests/OscReceiveTest.cpp
 %%DATADIR%%/osclib/oscpack/tests/OscReceiveTest.h
 %%DATADIR%%/osclib/oscpack/tests/OscSendTests.cpp
@@ -795,14 +793,20 @@
 %%DATADIR%%/pa-gtk.cpp
 %%DATADIR%%/pa-qt.cpp
 %%DATADIR%%/path-printer.cpp
+%%DATADIR%%/phaflangers.lib
+%%DATADIR%%/physmodels.lib
 %%DATADIR%%/plot.cpp
 %%DATADIR%%/pure.c
 %%DATADIR%%/pure.cpp
 %%DATADIR%%/puredata.cpp
 %%DATADIR%%/q.cpp
 %%DATADIR%%/ra-qt.cpp
+%%DATADIR%%/reducemaps.lib
+%%DATADIR%%/reverbs.lib
 %%DATADIR%%/ros-callbacks.cpp
+%%DATADIR%%/routes.lib
 %%DATADIR%%/scheduler.cpp
+%%DATADIR%%/signals.lib
 %%DATADIR%%/smartKeyboard/LICENCE.md
 %%DATADIR%%/smartKeyboard/README.md
 %%DATADIR%%/smartKeyboard/android/app/CMakeLists.txt
@@ -894,8 +898,13 @@
 %%DATADIR%%/smartKeyboard/iOS/Faust/main.m
 %%DATADIR%%/snd-rt-gtk.cpp
 %%DATADIR%%/sndfile.cpp
+%%DATADIR%%/spats.lib
+%%DATADIR%%/stdfaust.lib
 %%DATADIR%%/supercollider.cpp
 %%DATADIR%%/synthfile.cpp
+%%DATADIR%%/synths.lib
+%%DATADIR%%/tonestacks.lib
+%%DATADIR%%/tubes.lib
 %%DATADIR%%/unity/Android/Android.mk
 %%DATADIR%%/unity/Android/Application.mk
 %%DATADIR%%/unity/FaustPlugin_template.cs
@@ -903,6 +912,7 @@
 %%DATADIR%%/unity/README.md
 %%DATADIR%%/unity/unity.cpp
 %%DATADIR%%/unity/unityplugin.cpp
+%%DATADIR%%/vaeffects.lib
 %%DATADIR%%/vst.cpp
 %%DATADIR%%/webaudio/ExportLib.js
 %%DATADIR%%/webaudio/WebMIDIAPI.js
@@ -919,7 +929,6 @@
 %%DATADIR%%/webaudio/export-wrapper.html
 %%DATADIR%%/webaudio/faustlive-local-worker.html
 %%DATADIR%%/webaudio/faustlive-local.html
-%%DATADIR%%/webaudio/faustlive-wasm-worklet.html
 %%DATADIR%%/webaudio/faustlive-wasm.html
 %%DATADIR%%/webaudio/faustlive.html
 %%DATADIR%%/webaudio/favicon.ico
@@ -941,7 +950,12 @@
 %%DATADIR%%/webaudio/noise-wasm.html
 %%DATADIR%%/webaudio/noise.js
 %%DATADIR%%/webaudio/noise.wasm
+%%DATADIR%%/webaudio/organ-wasm.html
+%%DATADIR%%/webaudio/organ.dsp
+%%DATADIR%%/webaudio/organ.js
+%%DATADIR%%/webaudio/organ.wasm
 %%DATADIR%%/webaudio/osc-wasm.html
+%%DATADIR%%/webaudio/osc.dsp
 %%DATADIR%%/webaudio/osc.js
 %%DATADIR%%/webaudio/osc.wasm
 %%DATADIR%%/webaudio/qrcode.js
@@ -966,7 +980,6 @@
 %%DATADIR%%/webaudio/webaudio-wasm-poly-worklet-footer.html
 %%DATADIR%%/webaudio/webaudio-wasm-standalone-wrapper.js
 %%DATADIR%%/webaudio/webaudio-wasm-worklet-footer.html
-%%DATADIR%%/webaudio/webaudio-wasm-worklet-wrapper.js
 %%DATADIR%%/webaudio/webaudio-wasm-wrapper.js
 %%DATADIR%%/webaudio/webaudio-workletnode-poly-standalone-wrapper.js
 %%DATADIR%%/webaudio/webaudio-workletnode-standalone-wrapper.js
@@ -975,7 +988,6 @@
 %%DATADIR%%/webaudio/webaudio.html
 %%DATADIR%%/webaudio/webaudio.js
 %%DATADIR%%/windowsdll.cpp
-share/man/man1/faust.1
 %%HIGHLIGHT%%share/apps/katepart/syntax/faust.xml
 %%HIGHLIGHT%%share/gtksourceview-2.0/language-specs/faust.lang
 %%HIGHLIGHT%%share/gtksourceview-3.0/language-specs/faust.lang