x11/xpra-html5: Update to 6.1

Add www/hs-hjsmin to the list of possible minifiers.

3 files changed, 42 insertions, 44 deletions

diff --git a/x11/xpra-html5/Makefile b/x11/xpra-html5/Makefile
index 32d5244a0093..54823b09dc59 100644
--- a/x11/xpra-html5/Makefile
+++ b/x11/xpra-html5/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	xpra-html5
-PORTVERSION=	5.0
-PORTREVISION=	1
+PORTVERSION=	6.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11
 
@@ -15,13 +14,20 @@ BUILD_DEPENDS=	brotli:archivers/brotli
 
 USES=		python:3.6+,build
 
-OPTIONS_DEFINE=		MINIFY
-OPTIONS_DEFAULT=	MINIFY
+OPTIONS_DEFAULT=	YUICOMPRESSOR
 
-MINIFY_DESC=		Minify JavaScript source files
-MINIFY_BUILD_DEPENDS=	yuicompressor:www/yuicompressor
-MINIFY_VARS=		minifier=yuicompressor
-MINIFY_VARS_OFF=	minifier=copy
+OPTIONS_RADIO=		MINIFIER
+OPTIONS_RADIO_MINIFIER=	HJSMIN YUICOMPRESSOR
+
+MINIFIER_DESC=		JavaScript sources minification
+YUICOMPRESSOR_DESC=	Minify JavaScript with yuicompressor (Java)
+HJSMIN_DESC=		Minify JavaScript with hjsmin (Haskell)
+
+YUICOMPRESSOR_BUILD_DEPENDS=	yuicompressor:www/yuicompressor
+YUICOMPRESSOR_VARS=		minifier=yuicompressor
+
+HJSMIN_BUILD_DEPENDS=	hjsmin:www/hs-hjsmin
+HJSMIN_VARS=		minifier=hjsmin
 
 USE_PYTHON=	noflavors
 
@@ -32,6 +38,12 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 ETCDIR=		${PREFIX}/etc/xpra/html5-client
 
+.include <bsd.port.options.mk>
+
+.if !${PORT_OPTIONS:MYUICOMPRESSOR} && !${PORT_OPTIONS:MHJSMIN}
+MINIFIER=	copy
+.endif
+
 do-install:
 	cd ${WRKSRC} && ${PYTHON_CMD} setup.py install ${STAGEDIR} ${PREFIX}/share/xpra/www ${ETCDIR} ${MINIFIER}
 
diff --git a/x11/xpra-html5/distinfo b/x11/xpra-html5/distinfo
index 7c1dc1e08561..18b92f268990 100644
--- a/x11/xpra-html5/distinfo
+++ b/x11/xpra-html5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652463818
-SHA256 (Xpra-org-xpra-html5-v5.0_GH0.tar.gz) = 0e70566bfd91eb4eaae1deb2746812efeebce2ba8140ef3a3bb0be3dd0d0b230
-SIZE (Xpra-org-xpra-html5-v5.0_GH0.tar.gz) = 1570694
+TIMESTAMP = 1667300385
+SHA256 (Xpra-org-xpra-html5-v6.1_GH0.tar.gz) = 298f85bdd99f075c9d58dcfb904d117283c8034b5f5d24f494d50433ed998ec0
+SIZE (Xpra-org-xpra-html5-v6.1_GH0.tar.gz) = 1416380
diff --git a/x11/xpra-html5/pkg-plist b/x11/xpra-html5/pkg-plist
index 47221075cb70..3716cb1b7101 100644
--- a/x11/xpra-html5/pkg-plist
+++ b/x11/xpra-html5/pkg-plist
@@ -1,12 +1,10 @@
+%%ETCDIR%%/default-settings.txt
 share/xpra/www/connect.html
 share/xpra/www/connect.html.br
 share/xpra/www/connect.html.gz
 share/xpra/www/css/bootstrap.css
 share/xpra/www/css/bootstrap.css.br
 share/xpra/www/css/bootstrap.css.gz
-share/xpra/www/css/bootstrap.css.map
-share/xpra/www/css/bootstrap.css.map.br
-share/xpra/www/css/bootstrap.css.map.gz
 share/xpra/www/css/client.css
 share/xpra/www/css/client.css.br
 share/xpra/www/css/client.css.gz
@@ -84,12 +82,12 @@ share/xpra/www/js/Keycodes.js.gz
 share/xpra/www/js/MediaSourceUtil.js
 share/xpra/www/js/MediaSourceUtil.js.br
 share/xpra/www/js/MediaSourceUtil.js.gz
-share/xpra/www/js/Menu-custom.js
-share/xpra/www/js/Menu-custom.js.br
-share/xpra/www/js/Menu-custom.js.gz
 share/xpra/www/js/Menu.js
 share/xpra/www/js/Menu.js.br
 share/xpra/www/js/Menu.js.gz
+share/xpra/www/js/MenuCustom.js
+share/xpra/www/js/MenuCustom.js.br
+share/xpra/www/js/MenuCustom.js.gz
 share/xpra/www/js/Notifications.js
 share/xpra/www/js/Notifications.js.br
 share/xpra/www/js/Notifications.js.gz
@@ -99,6 +97,9 @@ share/xpra/www/js/OffscreenDecodeWorker.js.gz
 share/xpra/www/js/OffscreenDecodeWorkerHelper.js
 share/xpra/www/js/OffscreenDecodeWorkerHelper.js.br
 share/xpra/www/js/OffscreenDecodeWorkerHelper.js.gz
+share/xpra/www/js/PaintWorker.js
+share/xpra/www/js/PaintWorker.js.br
+share/xpra/www/js/PaintWorker.js.gz
 share/xpra/www/js/Protocol.js
 share/xpra/www/js/Protocol.js.br
 share/xpra/www/js/Protocol.js.gz
@@ -114,18 +115,15 @@ share/xpra/www/js/VideoDecoder.js.gz
 share/xpra/www/js/Window.js
 share/xpra/www/js/Window.js.br
 share/xpra/www/js/Window.js.gz
-share/xpra/www/js/lib/AudioContextMonkeyPatch.js
-share/xpra/www/js/lib/AudioContextMonkeyPatch.js.br
-share/xpra/www/js/lib/AudioContextMonkeyPatch.js.gz
 share/xpra/www/js/lib/FileSaver.js
 share/xpra/www/js/lib/FileSaver.js.br
 share/xpra/www/js/lib/FileSaver.js.gz
+share/xpra/www/js/lib/StreamSaver.js
+share/xpra/www/js/lib/StreamSaver.js.br
+share/xpra/www/js/lib/StreamSaver.js.gz
 share/xpra/www/js/lib/aurora/aac.js
 share/xpra/www/js/lib/aurora/aac.js.br
 share/xpra/www/js/lib/aurora/aac.js.gz
-share/xpra/www/js/lib/aurora/aac.js.map
-share/xpra/www/js/lib/aurora/aac.js.map.br
-share/xpra/www/js/lib/aurora/aac.js.map.gz
 share/xpra/www/js/lib/aurora/aurora-xpra.js
 share/xpra/www/js/lib/aurora/aurora-xpra.js.br
 share/xpra/www/js/lib/aurora/aurora-xpra.js.gz
@@ -135,18 +133,9 @@ share/xpra/www/js/lib/aurora/aurora.js.gz
 share/xpra/www/js/lib/aurora/flac.js
 share/xpra/www/js/lib/aurora/flac.js.br
 share/xpra/www/js/lib/aurora/flac.js.gz
-share/xpra/www/js/lib/aurora/flac.js.map
-share/xpra/www/js/lib/aurora/flac.js.map.br
-share/xpra/www/js/lib/aurora/flac.js.map.gz
 share/xpra/www/js/lib/aurora/mp3.js
 share/xpra/www/js/lib/aurora/mp3.js.br
 share/xpra/www/js/lib/aurora/mp3.js.gz
-share/xpra/www/js/lib/aurora/mp3.js.map
-share/xpra/www/js/lib/aurora/mp3.js.map.br
-share/xpra/www/js/lib/aurora/mp3.js.map.gz
-share/xpra/www/js/lib/bencode.js
-share/xpra/www/js/lib/bencode.js.br
-share/xpra/www/js/lib/bencode.js.gz
 share/xpra/www/js/lib/broadway/AUTHORS
 share/xpra/www/js/lib/broadway/AUTHORS.br
 share/xpra/www/js/lib/broadway/AUTHORS.gz
@@ -162,9 +151,6 @@ share/xpra/www/js/lib/brotli_decode.js.gz
 share/xpra/www/js/lib/detect-zoom.js
 share/xpra/www/js/lib/detect-zoom.js.br
 share/xpra/www/js/lib/detect-zoom.js.gz
-share/xpra/www/js/lib/es6-shim.js
-share/xpra/www/js/lib/es6-shim.js.br
-share/xpra/www/js/lib/es6-shim.js.gz
 share/xpra/www/js/lib/forge.js
 share/xpra/www/js/lib/forge.js.br
 share/xpra/www/js/lib/forge.js.gz
@@ -195,18 +181,18 @@ share/xpra/www/js/lib/rencode.js.gz
 share/xpra/www/js/lib/simple-keyboard.js
 share/xpra/www/js/lib/simple-keyboard.js.br
 share/xpra/www/js/lib/simple-keyboard.js.gz
-share/xpra/www/js/lib/simple-keyboard.js.map
-share/xpra/www/js/lib/simple-keyboard.js.map.br
-share/xpra/www/js/lib/simple-keyboard.js.map.gz
 share/xpra/www/js/lib/slick.js
 share/xpra/www/js/lib/slick.js.br
 share/xpra/www/js/lib/slick.js.gz
+share/xpra/www/js/lib/web-streams-ponyfill.es6.js
+share/xpra/www/js/lib/web-streams-ponyfill.es6.js.br
+share/xpra/www/js/lib/web-streams-ponyfill.es6.js.gz
 share/xpra/www/js/lib/wsworker_check.js
 share/xpra/www/js/lib/wsworker_check.js.br
 share/xpra/www/js/lib/wsworker_check.js.gz
-share/xpra/www/js/lib/zlib.js
-share/xpra/www/js/lib/zlib.js.br
-share/xpra/www/js/lib/zlib.js.gz
-share/xpra/www/js/lib/zlib.pretty.js.map
-share/xpra/www/js/lib/zlib.pretty.js.map.br
-share/xpra/www/js/lib/zlib.pretty.js.map.gz
+share/xpra/www/mitm.html
+share/xpra/www/mitm.html.br
+share/xpra/www/mitm.html.gz
+share/xpra/www/sw.js
+share/xpra/www/sw.js.br
+share/xpra/www/sw.js.gz