CVS commit: pkgsrc/lang/fennel

["Yorick Hardy" <yhardy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   yhardy
Date:           Sat Jul 22 21:38:18 UTC 2023

Modified Files:
        pkgsrc/lang/fennel: Makefile PLIST distinfo
        pkgsrc/lang/fennel/patches: patch-Makefile

Log Message:
lang/fennel: update to fennel-1.3.1

1.3.1 / 2023-07-07

New Features

 * fennel.runtime-version will return version information as a
   table if given optional argument
 * Expose REPL's methods in the ___repl___ table, allowing method
   redefinition at runtime.
 * Allow following docstring with a metadata table syntax.
 * Return whole metadata table when metadata.get is called without
   a key.
 * Add :byte-escape option to fennel.view for overriding default
   char escapes
 * Generate man pages for fennel-api(3), fennel-reference(5), and
   fennel-tutorial(7) from their respective documentation.

Note for packagers: The man page fennel.1 has been moved to
man/man1/fennel.1 along with the new generated man pages. For build
scripts that copy files manually in lieu of make install, this may
require an update.

Bug Fixes

 * Fix a bug where operator compiler output had incorrect precedence
   with 3+ args
 * Fix a bug where the comment special would fail on forms
   containing "]]"
 * Fix a bug where tables like {:true 1 true 2} emit with unstable
   key order
 * Fix a bug where table literals mutated by a macro emit with
   unstable key order when AOT-compiled in Lua > 5.2
 * Fix a bug where very long individual lines in the repl would be
   truncated
 * Fix an edge case where {:__metatable true} (as in pandoc-lua)
   breaks fennel.view
 * Fix a 1.3.0 bug where macros only accepts table literals, not
   table-returning exprs
 * Fix a bug where metadata tables with different arglists break
   lambdas
 * Fix a bug with detecting cycles for tables that have custom
   __pairs metamethod in fennel.view
 * Fix a bug where vararg couldn't be the only thing in a hashfn


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/fennel/Makefile \
    pkgsrc/lang/fennel/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/fennel/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/fennel/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/lang/fennel/Makefile
diff -u pkgsrc/lang/fennel/Makefile:1.2 pkgsrc/lang/fennel/Makefile:1.3
--- pkgsrc/lang/fennel/Makefile:1.2     Thu Apr 27 12:45:56 2023
+++ pkgsrc/lang/fennel/Makefile Sat Jul 22 21:38:17 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2023/04/27 12:45:56 yhardy Exp $
+# $NetBSD: Makefile,v 1.3 2023/07/22 21:38:17 yhardy Exp $
 
-DISTNAME=      1.3.0
-PKGNAME=       ${LUA_PKGPREFIX}-fennel-1.3.0
+DISTNAME=      1.3.1
+PKGNAME=       ${LUA_PKGPREFIX}-fennel-1.3.1
 CATEGORIES=    lang
 MASTER_SITES=  https://git.sr.ht/~technomancy/fennel/archive/
 DIST_SUBDIR=   fennel
@@ -31,7 +31,7 @@ BUILD_TARGET= build
 MAKE_FLAGS+=   LUA_INTERPRETER=${LUA_INTERPRETER}
 
 INSTALL_MAKE_FLAGS+=   PREFIX=${PREFIX}
-INSTALL_MAKE_FLAGS+=   MAN_DIR=${PREFIX}/${PKGMANDIR}/man1
+INSTALL_MAKE_FLAGS+=   MAN_DIR=${PREFIX}/${PKGMANDIR}
 
 PLIST_SUBST+=  LUADOTVER=${_LUA_DOT_VERSION}
 FILES_SUBST+=  LUADOTVER=${_LUA_DOT_VERSION}
Index: pkgsrc/lang/fennel/distinfo
diff -u pkgsrc/lang/fennel/distinfo:1.2 pkgsrc/lang/fennel/distinfo:1.3
--- pkgsrc/lang/fennel/distinfo:1.2     Thu Apr 27 12:45:56 2023
+++ pkgsrc/lang/fennel/distinfo Sat Jul 22 21:38:17 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2023/04/27 12:45:56 yhardy Exp $
+$NetBSD: distinfo,v 1.3 2023/07/22 21:38:17 yhardy Exp $
 
-BLAKE2s (fennel/1.3.0.tar.gz) = eab7c8696c6c43cb52cfb573324f3d569cb639b5ae9bfb5e84d30833f2dd7d1f
-SHA512 (fennel/1.3.0.tar.gz) = b4b9b96f71d1cbbf5c81eae737aca01f7d417a227925d19008a923f5045a86a355297f927ecdb719653097f73d6d6df148955b1973e4483dd14e863384ca0ff3
-Size (fennel/1.3.0.tar.gz) = 280241 bytes
-SHA1 (patch-Makefile) = 7d5bc78b33725551ce9ce1cb11570377daeb99a3
+BLAKE2s (fennel/1.3.1.tar.gz) = 875fbe943b39ff69668c85ca2f4a3cd6c4ca23ff9da6ae6a5783bc9fd83f01bb
+SHA512 (fennel/1.3.1.tar.gz) = 421d479c4527898123020ecc231e5eea38c5f5f1216f4a0bed0a39b8123d6a21ba1b0e876d281dfde447fe000e34a81f706303b4daa2626cc7559c063990cd5f
+Size (fennel/1.3.1.tar.gz) = 293564 bytes
+SHA1 (patch-Makefile) = 37791a1b917854256dd2715b77297f3bf1d8fb04

Index: pkgsrc/lang/fennel/PLIST
diff -u pkgsrc/lang/fennel/PLIST:1.1 pkgsrc/lang/fennel/PLIST:1.2
--- pkgsrc/lang/fennel/PLIST:1.1        Tue Jan 10 21:51:30 2023
+++ pkgsrc/lang/fennel/PLIST    Sat Jul 22 21:38:17 2023
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2023/01/10 21:51:30 nikita Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/07/22 21:38:17 yhardy Exp $
 bin/fennel-${LUADOTVER}
 man/man1/fennel.1
+man/man3/fennel-api.3
+man/man5/fennel-reference.5
+man/man7/fennel-tutorial.7
 share/lua/${LUADOTVER}/fennel.lua

Index: pkgsrc/lang/fennel/patches/patch-Makefile
diff -u pkgsrc/lang/fennel/patches/patch-Makefile:1.1 pkgsrc/lang/fennel/patches/patch-Makefile:1.2
--- pkgsrc/lang/fennel/patches/patch-Makefile:1.1       Tue Jan 10 21:51:30 2023
+++ pkgsrc/lang/fennel/patches/patch-Makefile   Sat Jul 22 21:38:18 2023
@@ -1,15 +1,36 @@
-$NetBSD: patch-Makefile,v 1.1 2023/01/10 21:51:30 nikita Exp $
+$NetBSD: patch-Makefile,v 1.2 2023/07/22 21:38:18 yhardy Exp $
 
 Let pkgsrc add the shebang to the fennel launcher script
+Install manual pages relative to PKGMANDIR
 
---- Makefile.orig      2022-05-05 21:57:31.282820992 -0700
-+++ Makefile   2022-05-05 21:57:36.826751085 -0700
-@@ -41,7 +41,7 @@
+--- Makefile.orig      2023-07-07 20:09:35.000000000 +0000
++++ Makefile
+@@ -42,7 +42,7 @@ format: ; for f in $(SRC); do fnlfmt --f
  
  # All-in-one pure-lua script:
- fennel: src/launcher.fnl $(SRC)
+ fennel: src/launcher.fnl $(SRC) bootstrap/view.lua
 -      echo "#!/usr/bin/env $(LUA)" > $@
 +      echo "#!$(LUA_INTERPRETER)" > $@
-       $(LAUNCHER) --no-metadata --require-as-include --compile $< >> $@
+       FENNEL_PATH=src/?.fnl $(LUA) bootstrap/aot.lua $< --require-as-include >> $@
        chmod 755 $@
  
+@@ -134,8 +134,8 @@ coverage: fennel
+       $(LUA) -lluacov test/init.lua
+       @echo "generated luacov.report.out"
+ 
+-MAN_DOCS := man/man1/fennel.1 man/man3/fennel-api.3 man/man5/fennel-reference.5\
+-          man/man7/fennel-tutorial.7
++MAN_DOCS := man1/fennel.1 man3/fennel-api.3 man5/fennel-reference.5\
++          man7/fennel-tutorial.7
+ 
+ define maninst =
+ mkdir -p $(dir $(2)) && cp $(1) $(2)
+@@ -146,7 +146,7 @@ install: fennel fennel.lua
+       mkdir -p $(DESTDIR)$(BIN_DIR) && cp fennel $(DESTDIR)$(BIN_DIR)/
+       mkdir -p $(DESTDIR)$(LUA_LIB_DIR) && cp fennel.lua $(DESTDIR)$(LUA_LIB_DIR)/
+       $(foreach doc,$(MAN_DOCS),\
+-              $(call maninst,$(doc),$(DESTDIR)$(MAN_DIR)/$(doc)))
++              $(call maninst,man/$(doc),$(DESTDIR)$(MAN_DIR)/$(doc)))
+ 
+ uninstall:
+       rm $(DESTDIR)$(BIN_DIR)/fennel