Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_170284460253590"
MIME-Version: 1.0
Date: Sun, 17 Dec 2023 20:23:22 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/py-jsbeautifier
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: adam@netbsd.org
Message-Id: <20231217202322.759A4FA42@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_170284460253590
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Sun Dec 17 20:23:22 UTC 2023

Modified Files:
	pkgsrc/textproc/py-jsbeautifier: Makefile PLIST distinfo

Log Message:
py-jsbeautifier: updated to 1.14.11

v1.14.11

Editor not working https://beautifier.io/
Set nodejs minimum to v14
Invalid prettification of object with unicode escape character as object key
invalid json being generated with wrap_line_length

v1.14.9

Bump semver and editorconfig
Update editorconfig package
Allow to configure the "custom elements as inline elements" behavior

v1.14.8

Require nodejs v12 or greater
CSS insideNonNestedAtRule generic variable
Update dependencies
Fix CI build
Fixed 2133 Theme Toggle on without_codemirror Mode
use correct variable name
docs: Fix a few typos
Add support for new record types (cont.)
fix - semicolon followed by block statement doesnt have new line
Fix formatting related to the element
issue prettifying (function(){code();{code}})()

v1.14.7

Doc: Updates web browser implementation examples
HTML formatter breaks layout by introducing newlines

v1.14.6

Globs no longer work on Windows in 1.14.5

v1.14.5

Dependency updates and UI tweaks
Bump terser from 5.12.1 to 5.14.2
new layout breaks everything on long lines
Dark mode

v1.14.4

Extra space before !important added
css format removes space after quoted value
Add grid-template-areas to NON_SEMICOLON_NEWLINE_PROPERTY list
CSS formatter removes useful space
CHANGELOG.md file was wiped out in v1.14.2
Fails to recognize Handlebars block with whitespace control, e.g. {{~#if true ~}}
Support new sass @use syntax
Do not remove whitespace after number
html formatter doesn't support handlebars partial blocks
in keyword in class method causes indentation problem
space_after_named_function not working inside an ES6 class
Restyle website
improper line concatenation between 'return' and a prefix expression

v1.14.3

[LESS] Fixing issues with spacing when an object literal lives inside a mixin
Overindentation when using "class" as a key in an object
CSS Grid template formatting is broken when adding track size after line names
SCSS module system @use problem
JS "space_in_empty_paren" failing for class methods
LESS mixins gets formatted strangely

v1.14.2

Why put npm in dependencies?
[Bug] Logical assignments in JS are incorrectly beautified

v1.14.1

feature request: cmd+enter hotkey for mac users
Wrong indentation when the last line in a case is a right brace

v1.14.0

import.meta appears on newline
Added buttons to website
Logical assignment operators; Fix parsing of optional chaining
Numbers should be allowed to contain underscores
Use native mkdirSync instead of 'mkdirp' package
selector_separator_newline adds erroneous newline on @extend SCSS statements


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/py-jsbeautifier/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/py-jsbeautifier/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/py-jsbeautifier/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_170284460253590
Content-Disposition: inline
Content-Length: 4086
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/py-jsbeautifier/Makefile
diff -u pkgsrc/textproc/py-jsbeautifier/Makefile:1.20 pkgsrc/textproc/py-jsbeautifier/Makefile:1.21
--- pkgsrc/textproc/py-jsbeautifier/Makefile:1.20	Wed Jan  5 15:41:24 2022
+++ pkgsrc/textproc/py-jsbeautifier/Makefile	Sun Dec 17 20:23:22 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2022/01/05 15:41:24 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2023/12/17 20:23:22 adam Exp $
 
-DISTNAME=	jsbeautifier-1.13.13
+DISTNAME=	jsbeautifier-1.14.11
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=j/jsbeautifier/}
 
@@ -11,19 +10,18 @@ HOMEPAGE=	https://beautifier.io/
 COMMENT=	JavaScript unobfuscator and beautifier
 LICENSE=	mit
 
+TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=	${PYPKGPREFIX}-editorconfig-core>=0.12.2:../../devel/py-editorconfig-core
 DEPENDS+=	${PYPKGPREFIX}-six>=1.13.0:../../lang/py-six
 
-PYTHON_VERSIONED_DEPENDENCIES=	test:test
-
-USE_PKG_RESOURCES=	yes
-
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 	${MV} js-beautify js-beautify-${PYVERSSUFFIX} || ${TRUE}
 
-.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-jsbeautifier/PLIST
diff -u pkgsrc/textproc/py-jsbeautifier/PLIST:1.7 pkgsrc/textproc/py-jsbeautifier/PLIST:1.8
--- pkgsrc/textproc/py-jsbeautifier/PLIST:1.7	Mon May 10 09:22:34 2021
+++ pkgsrc/textproc/py-jsbeautifier/PLIST	Sun Dec 17 20:23:22 2023
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2021/05/10 09:22:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2023/12/17 20:23:22 adam Exp $
 bin/js-beautify-${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/jsbeautifier/__init__.py
 ${PYSITELIB}/jsbeautifier/__init__.pyc
 ${PYSITELIB}/jsbeautifier/__init__.pyo
@@ -66,6 +65,9 @@ ${PYSITELIB}/jsbeautifier/javascript/tok
 ${PYSITELIB}/jsbeautifier/tests/__init__.py
 ${PYSITELIB}/jsbeautifier/tests/__init__.pyc
 ${PYSITELIB}/jsbeautifier/tests/__init__.pyo
+${PYSITELIB}/jsbeautifier/tests/generated/__init__.py
+${PYSITELIB}/jsbeautifier/tests/generated/__init__.pyc
+${PYSITELIB}/jsbeautifier/tests/generated/__init__.pyo
 ${PYSITELIB}/jsbeautifier/tests/generated/tests.py
 ${PYSITELIB}/jsbeautifier/tests/generated/tests.pyc
 ${PYSITELIB}/jsbeautifier/tests/generated/tests.pyo

Index: pkgsrc/textproc/py-jsbeautifier/distinfo
diff -u pkgsrc/textproc/py-jsbeautifier/distinfo:1.19 pkgsrc/textproc/py-jsbeautifier/distinfo:1.20
--- pkgsrc/textproc/py-jsbeautifier/distinfo:1.19	Tue Oct 26 11:23:05 2021
+++ pkgsrc/textproc/py-jsbeautifier/distinfo	Sun Dec 17 20:23:22 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2021/10/26 11:23:05 nia Exp $
+$NetBSD: distinfo,v 1.20 2023/12/17 20:23:22 adam Exp $
 
-BLAKE2s (jsbeautifier-1.13.13.tar.gz) = 8d1b23bb43f75b6d0f83a234df2fba33a363a60838a3604d2f651019cdd221c5
-SHA512 (jsbeautifier-1.13.13.tar.gz) = 0ce01816e3d01ec12943fc11785a7ff93c147dc9a4cb451b7ccc352c491f6b81792eb861ebbae9326456ac6ff96d9ff5e3368418fe65ddaf6854ce1d20480111
-Size (jsbeautifier-1.13.13.tar.gz) = 72512 bytes
+BLAKE2s (jsbeautifier-1.14.11.tar.gz) = 67d0c230d90bcc7676cc055e4d806daca508d0d8518f43babdc0a33e7920a4cc
+SHA512 (jsbeautifier-1.14.11.tar.gz) = d84847ad71af40a08ca47af449eeaaaf1d4b8ad3981f9573b4322e42b0060caba0fbd2632d6686306fcdac64a7e03ad6eaf9ad4461489984aabff3b33331a310
+Size (jsbeautifier-1.14.11.tar.gz) = 75586 bytes


--_----------=_170284460253590--