Received: by mail.netbsd.org (Postfix, from userid 605) id C0F5184F69; Sat, 25 Feb 2023 00:13:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AB26084F67 for ; Sat, 25 Feb 2023 00:09:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id jusrCGAPSF1H for ; Sat, 25 Feb 2023 00:09:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 21A2184D01 for ; Sat, 25 Feb 2023 00:09:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0B9AEFA90; Sat, 25 Feb 2023 00:09:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_167728378486080" MIME-Version: 1.0 Date: Sat, 25 Feb 2023 00:09:44 +0000 From: "Nikita" Subject: CVS commit: pkgsrc/www/nsm To: pkgsrc-changes@NetBSD.org Reply-To: nikita@netbsd.org X-Mailer: log_accum Message-Id: <20230225000944.0B9AEFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_167728378486080 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nikita Date: Sat Feb 25 00:09:43 UTC 2023 Modified Files: pkgsrc/www/nsm: Makefile distinfo pkgsrc/www/nsm/patches: patch-Makefile Log Message: nsm: update to version 2.4.12 ChangeLog (taken from https://github.com/nifty-site-manager/nsm/releases) Nift (aka nsm) v2.4.12 Release Notes: further improved line number tracing for errors added get_pwd and pwd to embedded lua updated to newer versions of LuaJIT 2.1.0-beta3 and ExprTk Nift (aka nsm) v2.4.11 Release Notes: added basic/fast multi-threading options to poke and rmv changed to strictly using templatestein when parsing constructed string for join function fixed up being able to use "fn" instead of "function" fixed up error function to handle multiple parameters improved reading bracketless codeblocks inside bracketed codeblocks (no longer need an empty end line) hunted down some bugs with line number tracing for errors Nift (aka nsm) v2.4.10 Release Notes: fixed up lolcat to handle finding the end of things with 'm' to avoid so much white fixed up bug with reading {} in unbracketed code blocks added trying to compile and evaluate unrecognised lines using ExprTk with functionstein (f++) added option (default value can be changed with exprtk.eval_params fn) to compile and evaluate params with ExprTk Nift (aka nsm) v2.4.9 Release Notes: added in ability to run scripts with nift script-path as well as nift run script-path, makes shebangs nicer for example further improved language detection improved lolcat piping of system calls across multiple statements and made more consistent across f++/n++/Lua(JIT)/ExprTK hopefully fixed bugs with n++ and zero param non-fns output (in particular $ instances) added script path as first parameter for argv Nift (aka nsm) v2.4.8 Release Notes: added in default of trying system call if failure with lua(jit) or exprtk in interactive (interp/sh) mode, they work better as shell extensions this way cleaned up language choice so ExprTk and templatestein and all reasonable derivatives work okay fixed up nsm_lang fns for Lua(JIT) and ExprTk to work with both string and char version of language selection updated sys/system fn output to use the called fn name rather than defaulting to system added in passing parameters to the nift run command with variables 'argc' (int) and 'argv' (vector) Nift (aka nsm) v2.4.7 Release Notes: Reverted to handling @fns with f++, too ingrained in the codebase Reverted to calling sys call on whole line for zero param functions Reverted to breaking at non-escaped @'s when reading function names Fixed up allowing for ';' at end of statements (hopefully no bugs/undesirable features), though any potential system call will be called on whole line for possibly multiple statements, use a new line if needed cleaned up (hopefully) language choice with interactive REPL's (both interp and sh) and run Ubuntu.zip Nift (aka nsm) v2.4.6 Release Notes: Initialised all bLineNo's to zero (started getting warnings on OSX) Fixed up "run commands" in-built scripts from last version to handle language names as well as chars for script extensions Added skip_whitespace fn to clean Parser.cpp codebase up a little bit Can now optionally use fn in place of function, mostly intended for interpreter/shell sessions Nift (aka nsm) v2.4.5 Release Notes: You can now do nift sh/interp lang and provided lang starts with the same char as the language you are specifying the prompt will match Added prompt.char(string) command Added in global $[cmd]rc.$[langChar] "run command" support on start of an interpreter or shell session Added in local .nsm/[interp/sh].$[langChar] "run command" support on start of an interpreter or shell session Added in treating a single parameter for f++/n++/lua/exprtk function calls as a file-path to a file Added in exprtk.file function to read and process ExprTk code at the file-path specified parameter Added in f/file option for exprtk and exprtk.compile functions* Nift (aka nsm) v2.4.4 Release Notes: Built-in improvements of unnecessarily repetitious code for lolcat-cc Fixed $() syntax to hopefully not conflict with common bash code Added lolcat.cmd and lolcat.status functions Added alternative inj option for sys/system calls for terminal/cmd line brevity Nift (aka nsm) v2.4.3 Release Notes: Fixed lolcat bug - it was a missing a space between nift/nsm and adding lolcat-cc in lolcat_init Improved escape code handling for lolcat-cc, now seems to work for most animations Stopped Nift from creating hash info files wherever it runs a script (anyone remember what that code is for?) Nift (aka nsm) v2.4.2 Release Notes: fixed some rather embarrassing bugs for initialising projects Nift (aka nsm) v2.4.1 Release Notes: added duplicate Nift commands edit/open for opening files from page names added duplicate Nift commands medit/mopen for opening files for a specific page name from mirror directories added Nift command mbcp for running build-commit-push on multiple mirrors Nift (aka nsm) v2.4.0 Release Notes: added some general 'unknown error' try-catch blocks to help avoid REPL sessions fully crashing made a few alterations to FixIndenting.cpp including a sterm "use at your own risk" warning. fixed a bunch of bugs and added a few try-catch blocks to catch unknown bugs without crashing removed info-config command (can now use Nift to open the config files!) Nift (aka nsm) v2.3.13 Release Notes: added program with makefile option to clean up indenting for source code fixed indenting whitespace for the Makefile fixed major bug with reading blocks (both bracketed and non-bracketed) patched (ie. reverted LDFLAGS to LINK) makefile for FreeBSD and Gentoo cleaned up various ways of using lolcat with Nift added native support for external lolcat programs using lolcat.on(lolcat_command) (breaking change sorry) had to change to $ before grave accent ExprTk expressions so that functionstein works better as both a scripting extension language and a shell extension language, especially for flashell (hopefully not an issue when using Nift with perl or anything else) (breaking change sorry) no longer require @ in front of grave accent ExprTk expressions Nift (aka nsm) v2.3.12 Release Notes: one liner fix of not reading terminal config string quoted added nsm config global/project command to open config file with configured editor added improved mod fn from lolcat-cc to Lolcat.cpp added parameter option for lolcat.on to specify which lolcat command to use Nift (aka nsm) v2.3.11 Release Notes: added config support for number of pagination threads have changed to leaving instances of '@' with functionstein (f++) (fixes using @, eg. cloning from bitbucket) ran a* regression on read block code (python gang assemble) To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/nsm/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/nsm/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/nsm/patches/patch-Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_167728378486080 Content-Disposition: inline Content-Length: 3077 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/nsm/Makefile diff -u pkgsrc/www/nsm/Makefile:1.10 pkgsrc/www/nsm/Makefile:1.11 --- pkgsrc/www/nsm/Makefile:1.10 Fri Feb 24 21:37:06 2023 +++ pkgsrc/www/nsm/Makefile Sat Feb 25 00:09:43 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2023/02/24 21:37:06 he Exp $ +# $NetBSD: Makefile,v 1.11 2023/02/25 00:09:43 nikita Exp $ -DISTNAME= nsm-2.3.10 +DISTNAME= nsm-2.4.12 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GITHUB:=nifty-site-manager/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -19,6 +19,7 @@ INSTALLATION_DIRS= bin # of the binary size and some double computation. # closed upstream ticket: # https://github.com/nifty-site-manager/nsm/issues/2 +# upstream now copies instead of symlinking. SUBST_CLASSES+= nift SUBST_STAGE.nift= pre-configure SUBST_FILES.nift= Makefile Index: pkgsrc/www/nsm/distinfo diff -u pkgsrc/www/nsm/distinfo:1.11 pkgsrc/www/nsm/distinfo:1.12 --- pkgsrc/www/nsm/distinfo:1.11 Tue Oct 26 11:29:41 2021 +++ pkgsrc/www/nsm/distinfo Sat Feb 25 00:09:43 2023 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.11 2021/10/26 11:29:41 nia Exp $ +$NetBSD: distinfo,v 1.12 2023/02/25 00:09:43 nikita Exp $ -BLAKE2s (nsm-2.3.10.tar.gz) = 79d16ab2ea33c9cc0ffb33a2186435c88e32fd09de19b30a2ebbc48578df43b3 -SHA512 (nsm-2.3.10.tar.gz) = b329b71b4af87820d75ca82c6bb429c82088f2cae24acdfbbb7cf6ededfd54a91ad96ac605b57d359770faa3f9956745d822d08ed1c83a7678f4a2781e904492 -Size (nsm-2.3.10.tar.gz) = 1607394 bytes +BLAKE2s (nsm-2.4.12.tar.gz) = 48df98ee345fcb3ea24a3322659189d274898511efb2d33c626e8a756ff14098 +SHA512 (nsm-2.4.12.tar.gz) = c3372edfe406f3f6de3b87454e862b445c4dfdda732d977069e80cd6e68666be4112e909b568b6cf7f0b5c748961dab8064e83a9cc198ea7cd301f0d05522236 +Size (nsm-2.4.12.tar.gz) = 1632264 bytes SHA1 (patch-Lua.h) = bc3fd674e8fbb506b168820b688f3c572304e16b -SHA1 (patch-Makefile) = 4af14ac2df1ce272214322b3f82bc91cd9e005e6 +SHA1 (patch-Makefile) = 01ff8e103a032d95584a0f377eeb96d946b00e08 Index: pkgsrc/www/nsm/patches/patch-Makefile diff -u pkgsrc/www/nsm/patches/patch-Makefile:1.3 pkgsrc/www/nsm/patches/patch-Makefile:1.4 --- pkgsrc/www/nsm/patches/patch-Makefile:1.3 Tue Apr 13 08:55:59 2021 +++ pkgsrc/www/nsm/patches/patch-Makefile Sat Feb 25 00:09:43 2023 @@ -1,15 +1,15 @@ -$NetBSD: patch-Makefile,v 1.3 2021/04/13 08:55:59 nia Exp $ +$NetBSD: patch-Makefile,v 1.4 2023/02/25 00:09:43 nikita Exp $ use LDFLAGS for linking rather than CXXFLAGS. ---- Makefile.orig 2020-05-24 10:59:03.000000000 +0000 -+++ Makefile -@@ -223,7 +223,7 @@ ifeq ($(detected_OS),Windows) # Windows - $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LINK) - copy nsm.exe nift.exe +--- Makefile.orig 2021-04-11 07:30:01.000000000 +0200 ++++ Makefile 2023-02-25 00:48:43.500141258 +0100 +@@ -223,7 +223,7 @@ + $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LDFLAGS) + copy nsm.exe nift.exe else -- $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LINK) -+ $(CXX) $(LDFLAGS) $(objects) -o nsm $(LINK) - cp nsm nift +- $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LDFLAGS) ++ $(CXX) $(LDFLAGS) $(objects) -o nsm $(LDFLAGS) + cp nsm nift endif - + --_----------=_167728378486080--