Index: head/devel/juce/Makefile
===================================================================
--- head/devel/juce/Makefile	(revision 569248)
+++ head/devel/juce/Makefile	(revision 569249)
@@ -1,61 +1,87 @@
 # $FreeBSD$
 
 PORTNAME=	juce
 DISTVERSION=	6.0.8
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ application framework to develop desktop and mobile applications
 
 LICENSE=	JUCE6
 LICENSE_NAME=	JUCE 6 End User License Agreement
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror
 
 BUILD_DEPENDS=	ladspa>0:audio/ladspa
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfreetype.so:print/freetype2 \
 		libsysinfo.so:devel/libsysinfo
 
 USES=		cmake compiler:c++11-lang gl localbase:ldflags xorg
 USE_GL=		gl
 USE_XORG=	x11 xcomposite xcursor xext xinerama xorgproto xrandr
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	yurivict # juce-framework
+GH_ACCOUNT=	yurivict # juce-framework + BSD patches
 GH_PROJECT=	JUCE
-GH_TAGNAME=	107cc92
+GH_TAGNAME=	f37e9a1
 
-CMAKE_ON=	JUCE_BUILD_EXTRAS # JUCE_BUILD_EXAMPLES
+CMAKE_ON=	JUCE_BUILD_EXTRAS
 
 CXXFLAGS+=	-I${LOCALBASE}/include/freetype2
 LDFLAGS+=	-pthread -lfreetype
 LDFLAGS+=	-lGL # while building NetworkGraphicsDemo ld: error: undefined symbol: glXGetCurrentContext referenced by ld-temp.o
 LDFLAGS+=	-lasound # while building AudioPerformanceTest ld: error: undefined symbol: snd_seq_system_info_sizeof
 LDFLAGS+=	-lsysinfo # while building Projucer ld: error: undefined symbol: sysinfo
 
-CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lsysinfo -lexecinfo" # for the step 'Building juceaide' during configure phase: https://github.com/juce-framework/JUCE/issues/877
+CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lexecinfo" # for the step 'Building juceaide' during configure phase: https://github.com/juce-framework/JUCE/issues/877
 
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
+OPTIONS_DEFINE=		DEMOS
+
+DEMOS_DESC=		Build and install demo programs
+DEMOS_USES=		gnome pkgconfig
+DEMOS_CMAKE_BOOL=	JUCE_BUILD_EXAMPLES
+DEMOS_LDFLAGS=		-lexecinfo
+DEMOS_USE=		GNOME=atk,cairo,gdkpixbuf2,gtk30,pango
+DEMOS_LIB_DEPENDS=	libcurl.so:ftp/curl \
+			libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+			libsoup-2.4.so:devel/libsoup
+DEMO_FILES=	\
+	AnalyticsCollectionDemo AnimationAppDemo AnimationDemo AudioAppDemo AudioLatencyDemo AudioPlaybackDemo AudioPluginDemo AudioRecordingDemo AudioSettingsDemo AudioSynthesiserDemo \
+	BlocksDrawingDemo BlocksMonitorDemo BlocksSynthDemo BouncingBallWavetableDemo Box2DDemo ChildProcessDemo CodeEditorDemo ComponentDemo ComponentTransformsDemo ConvolutionDemo \
+	CryptographyDemo DSPModulePluginDemo DialogsDemo FIRFilterDemo FlexBoxDemo FontsDemo GainDemo GraphicsDemo GridDemo HelloWorldDemo \
+	IIRFilterDemo ImagesDemo InAppPurchasesDemo JavaScriptDemo KeyMappingsDemo LiveConstantDemo LookAndFeelDemo MDIDemo MPEDemo MenusDemo \
+	MidiDemo MultiTouchDemo MultithreadingDemo NetworkingDemo OSCDemo OpenGLAppDemo OpenGLDemo OscillatorDemo OverdriveDemo PluckedStringsDemo \
+	PropertiesDemo SIMDRegisterDemo SimpleFFTDemo StateVariableFilterDemo SystemInfoDemo TimersAndEventsDemo UnitTestsDemo ValueTreesDemo WaveShaperTanhDemo WebBrowserDemo \
+	WidgetsDemo WindowsDemo XMLandJSONDemo
+DEMOS_PLIST_FILES=	${DEMO_FILES:S/^/bin\/${PORTNAME}-/}
+
 post-patch:
 	# fix fonts.conf path
-	@${REINPLACE_CMD} -e ' \
+	@${REINPLACE_CMD} -i '' -e ' \
 		s|"/etc/fonts/fonts.conf"|"${PREFIX}/etc/fonts/fonts.conf"| ; \
 		s|"/usr/share/fonts/fonts.conf"|"${PREFIX}/share/fonts/fonts.conf"| \
 		' ${WRKSRC}/modules/juce_graphics/native/juce_linux_Fonts.cpp
 	# fix JUCE modules path (but it still complains about the path)
-	@${REINPLACE_CMD} -e ' \
+	@${REINPLACE_CMD} -i '' -e ' \
 		s|"~/JUCE|"${PREFIX}/include/JUCE-${PORTVERSION}| \
 		' ${WRKSRC}/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp
 
 post-install:
 	# install extras which are essential apps that aren't installed by the project for some reason
 .for exe in AudioPerformanceTest AudioPluginHost BinaryBuilder NetworkGraphicsDemo Projucer UnitTestRunner
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/extras/${exe}/${exe}_artefacts/Release/${exe} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	# fix path and strip juceaide
 	cd ${STAGEDIR}${PREFIX} && ${MV} bin/JUCE-${PORTVERSION}/juceaide bin/ && ${RMDIR} bin/JUCE-${PORTVERSION}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/juceaide
+
+do-install-DEMOS-on:
+.for e in ${DEMO_FILES}
+	${INSTALL_PROGRAM} `${FIND} ${BUILD_WRKSRC} -name ${e}` ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${e}
+.endfor
 
 .include <bsd.port.mk>
Index: head/devel/juce/distinfo
===================================================================
--- head/devel/juce/distinfo	(revision 569248)
+++ head/devel/juce/distinfo	(revision 569249)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616695479
-SHA256 (yurivict-JUCE-6.0.8-107cc92_GH0.tar.gz) = c2701575857b7ef96898b20811801cb3144d2d7fba89babba888bf7497b4c055
-SIZE (yurivict-JUCE-6.0.8-107cc92_GH0.tar.gz) = 14055294
+TIMESTAMP = 1616748092
+SHA256 (yurivict-JUCE-6.0.8-f37e9a1_GH0.tar.gz) = fb29c3d96d94234898fb0c0881a17e7ecb869e77cfdd8b561e63412cd5346b89
+SIZE (yurivict-JUCE-6.0.8-f37e9a1_GH0.tar.gz) = 14055337
Index: head/devel/juce/pkg-message
===================================================================
--- head/devel/juce/pkg-message	(revision 569248)
+++ head/devel/juce/pkg-message	(revision 569249)
@@ -1,15 +1,15 @@
 [
 { type: install
   message: <<EOM
-You installed JUCE: C++ application framework
+You installed JUCE: C++ application framework.
 
 The main application that you probably need is Projucer. It allows you
 to develop, manage and deploy cross-platform applications.
 
 Projucer currently can't create makefiles on Linux/BSD platforms because
 this feature has not yet been made available by JUCE developers on these
 platforms.
 
 EOM
 }
 ]