From nobody Sun Nov 27 14:06:32 2022 X-Original-To: dev-commits-ports-all@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 4NKr4T0115z4hwPP; Sun, 27 Nov 2022 14:06:33 +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 4NKr4S6Z57z3R0S; Sun, 27 Nov 2022 14:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669557992; 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=eyisHI4oD6+2v28RrWnzsUv+Vg0iq0yLzftvIEim/kw=; b=irGxr0xzWw3vYEyRg2T5Ki5AjfFfVWQX14Wm1Y3GrdS/mqPTTs+cZJjECoI7t0oTe9mVJ8 OzMuJu1naUoyQRoiwBhwwy+Og4Lv1sGQzFtvFmaaNqzAZyy0rOqNFcQEAielRpXJ9RKCjK ++EWOwY82jBMSFF6P56rj2SOJI6u13FYi6R4z5gSGC3zgSQfTFguu8kB8NvFrIAHnysgdU GZucJbx7+QYH24A0/0w17Ojp1kkSuAakCW4UtTdQVG/C01XBcJtpePujjC/Pl/diT7FDRC tZ3SAEUkJt32Nx5C+kJf400/ARdi+9A+mkqSGST2szTS2Zqyaq3oAShOozRQaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669557992; 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=eyisHI4oD6+2v28RrWnzsUv+Vg0iq0yLzftvIEim/kw=; b=KcSMx25q9I2+Sd4xykCuTrZ7AmhZ5kiERZ85lYERX1YwkVV8rgYvCTAhhWWO3R6PpsYVrB qE8SH31AZqWLBYMonJZd6nNutpChNdIiIK33T9bprmQ2zEd0fB8xjCbaMy78hHZprAjRmJ MnyrLBpP0eX3jfTwOjrMftVvEf6hpIReSrZH2kXXYAkFhLbQkcQuvYnnCF1TVnEKpTQfI5 fyxTiFxiE2lGwQfmlRLKQ0HGOLfVV+Nqh02uus5uYy39gSfmSI+dXv8sXyB/MuE1LDEF5B oq04E5tkOlV0kUy+vkQvqTE7XQlHRcCn7OD3NwkFj3I2QOJwjX60WCEQcRALlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669557992; a=rsa-sha256; cv=none; b=DMMFsf7yJWrpEV+XelDBVQfD7eLlX/YAsIqXN9k2CPYxbvnaBRo/GjseikBNF/gyX1rp56 vb7Hg2t92YDPw0Fd2Irv/PUtrvsxOXETES22Q7BWDzMfqYY/PIm3x/pXUvTF18sv4DYeRy aSIBomWt8PaFBIwikjzBMUK0c1DMHllZeLMmokM8rsP8VR896qzlfSymJCFXOCviEWp+d6 MC6Dl92AgzQLhDHLMfnslmrSQfNVvdYt3W6Pcd145sM5VkhM2FGrzb/NDo8wD//+1d7d6r /AtOb6TGwxPX5BlkXcq1bhmQz3SL73KSQxHrhHyBXdhhcEHzagea6ZLF5PTabg== 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 4NKr4S5ccNz11HG; Sun, 27 Nov 2022 14:06:32 +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 2ARE6Wo8056115; Sun, 27 Nov 2022 14:06:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ARE6Wx6056114; Sun, 27 Nov 2022 14:06:32 GMT (envelope-from git) Date: Sun, 27 Nov 2022 14:06:32 GMT Message-Id: <202211271406.2ARE6Wx6056114@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nicola Vitale Subject: git: b248aa163e80 - main - www/csso: Fix a runtime error List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nivit X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b248aa163e80a73ba4955042a30994d948cc9c3d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=b248aa163e80a73ba4955042a30994d948cc9c3d commit b248aa163e80a73ba4955042a30994d948cc9c3d Author: Nicola Vitale AuthorDate: 2022-11-27 14:04:21 +0000 Commit: Nicola Vitale CommitDate: 2022-11-27 14:05:17 +0000 www/csso: Fix a runtime error - Add a temporary patch to fix the following error: /usr/local/share/csso/lib/csso.js:69 print(fs.readFileSync(__dirname.slice(0, __dirname.lastIndexOf('/')) + '/' + filename).toString()); ^ TypeError: print is not a function at printFile (/usr/local/share/csso/lib/csso.js:69:5) at Object. (/usr/local/share/csso/lib/csso.js:28:5) at Module._compile (internal/modules/cjs/loader.js:1236:30) at Object.Module._extensions..js (internal/modules/cjs/loader.js:1257:10) at Module.load (internal/modules/cjs/loader.js:1085:32) at Function.Module._load (internal/modules/cjs/loader.js:950:14) at Function.executeUserEntryPoint [as runMain] (internal/modules/run_main.js:60:12) at internal/main/run_main_module.js:17:47 This happens because the function util.print() has been removed by recent versions of node. - Install the file VERSION (required when using --version switch) - Reorder variables in Makefile - Bump PORTREVISION (pkg-plist changed) PR: 268010 Reported by: Chris Hutchinson --- www/csso/Makefile | 10 ++++------ www/csso/files/patch-lib_csso.js | 12 ++++++++++++ www/csso/pkg-plist | 1 + 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/www/csso/Makefile b/www/csso/Makefile index 699bdf877942..d5b5817d8611 100644 --- a/www/csso/Makefile +++ b/www/csso/Makefile @@ -1,7 +1,7 @@ PORTNAME= csso PORTVERSION= 1.3.9 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://nivit.altervista.org/FreeBSD/ports/distfiles/ @@ -13,17 +13,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE.txt USES= nodejs:run - +USE_GITHUB= yes GH_ACCOUNT= css -NO_BUILD= yes NO_ARCH= yes - -USE_GITHUB= yes +NO_BUILD= yes do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/bin - ${INSTALL_DATA} ${WRKSRC}/USAGE ${STAGEDIR}${DATADIR}/USAGE + ${INSTALL_DATA} ${WRKSRC}/USAGE ${WRKSRC}/VERSION ${STAGEDIR}${DATADIR}/ ${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${DATADIR}/bin/${PORTNAME} ${LN} -sf ${DATADIR}/bin/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/lib diff --git a/www/csso/files/patch-lib_csso.js b/www/csso/files/patch-lib_csso.js new file mode 100644 index 000000000000..351f7f49219f --- /dev/null +++ b/www/csso/files/patch-lib_csso.js @@ -0,0 +1,12 @@ +--- lib/csso.js.orig 2013-10-15 12:47:12 UTC ++++ lib/csso.js +@@ -1,7 +1,8 @@ + var fs = require('fs'), +- print = require('util').print, + csso = require('./cssoapi.js'), + src, x; ++ ++var print = console.log; + + var args = process.argv.slice(2), + opts = args.length ? getOpts(args, [ diff --git a/www/csso/pkg-plist b/www/csso/pkg-plist index 4e4e4088f436..90ab0302900e 100644 --- a/www/csso/pkg-plist +++ b/www/csso/pkg-plist @@ -1,5 +1,6 @@ bin/csso %%DATADIR%%/USAGE +%%DATADIR%%/VERSION %%DATADIR%%/bin/csso %%DATADIR%%/lib/compressor.js %%DATADIR%%/lib/csso.js