From nobody Tue Nov 01 12:00:56 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N1pWY0dN1z4g7Sw; Tue, 1 Nov 2022 12:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N1pWY0BXVz3S9r; Tue, 1 Nov 2022 12:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667304057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/GMdjI502Jp34c9dg3X0+KyNv58//YSo+jDjynby98=; b=TSIj99vAyEn/qFNLvKCyWC8U06Q0sl0jciDjABBv3K7gV3W5ZHhMt4kmv5N+SQQCj2YJmo uCkP2c3sCJ6dK6P149LtO56MijT8/3bRlo9tYrIaFpoAqjCRqyxMR3njqOGmmZfZ0VyRjV 4q1agMPMkwI0ENT3b4nf4chlm0xC+Itpm0JWxg3Y1lith5OaaZ5nCrViXzho5iSfSu4ppM CA/QD/5R4GVXjl1KzYmlIg18BmcQdUsIwFtjxDaaTkFBeAcYOcsT9nsWxUImc9PRhp/8u9 AvOUT42yfl9QiMNOsOEsf2P4XkS3tHs0FRVZlIA1ZZX1Ktlf8e0qHFrgAf3aag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N1pWX6Mw5zFq7; Tue, 1 Nov 2022 12:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A1C0u7a001274; Tue, 1 Nov 2022 12:00:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1C0uHU001273; Tue, 1 Nov 2022 12:00:56 GMT (envelope-from git) Date: Tue, 1 Nov 2022 12:00:56 GMT Message-Id: <202211011200.2A1C0uHU001273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 60787a90e6d8 - main - x11/xpra-html5: Update to 6.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60787a90e6d87230d01621564138986184895813 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667304057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/GMdjI502Jp34c9dg3X0+KyNv58//YSo+jDjynby98=; b=AXnE7pJnz0d+CsPCAwshu/r/NG1BnUIfzG0vXk/P3aYLgD0Ud3BkxMwz9fEJlTFXDtQpT/ Y4A0PmT9L2HXbw79JBBfoqveenWum5ExuEwJRCDcIh1tNu+q5Hl7zvlseIq2uNwLcba3gU OWW2Hmb5Eatt1+VYHDbvezmUTiGX/dnk6EZgr/dGBrYWyOw6gcyapPmjhrLSwVDngFxUqr csp9s8b6/QvntVhsouICwPsJNuJe5/t+7r5W6WXMSaFp/ojN5oEcS/+p/2kEyulkc+b7uZ iEFV65vf0JoJn2bU1H82+uqDrIW5ePv5J9RPPRE8O2CuPAn6MuIUfZGqkw6ZDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667304057; a=rsa-sha256; cv=none; b=oViLpInFqjaovW+Rig5rbpV05OdIau2tIVqB5LT8HwlewI9cOgHWaqiBtOBGyECgi211LQ SqW535dr7FiTmYAFi7elVH5PEND1WW98LBmQ79IQuC9tyAFGaWcHn7Vl/H3jhIotBqvAKW AKt0V0Jpvy8j4AUXJ7jimMM95xyI3KexsDj1XQdKzwp8Kj5VNWiVxOcBb4HaHMVv/g16fC mGhy277JFT8kYnoNHvMjioyMk2ZMRwwkA7Pi1XYtZ/cn1CUTgwrCzfxH+ci1Pw58BqIgUB WMhXZiXQmTQdgEODB/dEcDoFqN4532YtKEptzVWnvjGkudY6SdRHkWn0Ew4Fmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=60787a90e6d87230d01621564138986184895813 commit 60787a90e6d87230d01621564138986184895813 Author: Gleb Popov AuthorDate: 2022-11-01 11:59:25 +0000 Commit: Gleb Popov CommitDate: 2022-11-01 12:00:30 +0000 x11/xpra-html5: Update to 6.1 Add www/hs-hjsmin to the list of possible minifiers. --- x11/xpra-html5/Makefile | 28 ++++++++++++++++++-------- x11/xpra-html5/distinfo | 6 +++--- x11/xpra-html5/pkg-plist | 52 ++++++++++++++++++------------------------------ 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 + +.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