git: ae37f26f9e42 - main - lang/fennel: Update to 1.0.0

The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ae37f26f9e4294e96ee0ef62870d333251be1154

commit ae37f26f9e4294e96ee0ef62870d333251be1154
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2021-12-16 20:44:47 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2021-12-21 15:36:02 +0000

    lang/fennel: Update to 1.0.0
    
    Port changes:
    Respect upstream's default behavior and install the fennel script rather
    than fennel-bin, the native binary.
    
    Upstream changes:
    https://git.sr.ht/~technomancy/fennel/tree/main/item/changelog.md#100--2021-11-14
    
    Sponsored by:   The FreeBSD Foundation
---
 lang/fennel/Makefile             | 17 ++++++++---------
 lang/fennel/distinfo             |  6 +++---
 lang/fennel/files/patch-Makefile | 16 ++++++++--------
 lang/fennel/pkg-plist            |  3 +--
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/lang/fennel/Makefile b/lang/fennel/Makefile
index 522736b6a6fa..c242dc821649 100644
--- a/lang/fennel/Makefile
+++ b/lang/fennel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	fennel
-DISTVERSION=	0.10.0
-PORTREVISION=	1
+DISTVERSION=	1.0.0
 CATEGORIES=	lang
 MASTER_SITES=	https://git.sr.ht/~technomancy/${PORTNAME}/archive/${DISTVERSION}${EXTRACT_SUFX}?dummy=/
 
@@ -12,17 +11,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake lua:build
 
-MAKE_ENV=	LUA=${LUA_CMD} \
+MAKE_ENV=	DESTDIR=${STAGEDIR} \
+		LUA=${LUA_CMD} \
 		LUA_DIR=${LOCALBASE} \
 		LUA_INCLUDE_DIR=${LUA_INCDIR} \
+		LUA_VERSION=${LUA_VER} \
+		NATIVE_LUA_LIB=${LUA_LIBDIR}/liblua-${LUA_VER}.a \
 		STATIC_LUA_LIB=${LUA_LIBDIR}/liblua-${LUA_VER}.a
 
-ALL_TARGET=	${PORTNAME}-bin ${PORTNAME}.lua
+ALL_TARGET=	build
+TEST_TARGET=	test
 
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.lua ${STAGEDIR}${LUA_LIBDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}view.lua ${STAGEDIR}${LUA_LIBDIR}
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-bin ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/lang/fennel/distinfo b/lang/fennel/distinfo
index 6850c815aa8d..4726adeba867 100644
--- a/lang/fennel/distinfo
+++ b/lang/fennel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629469102
-SHA256 (fennel-0.10.0.tar.gz) = 8351a758dffa3cb4efc902a31f6a78e072f29534921e44dd550c73e4529f75a5
-SIZE (fennel-0.10.0.tar.gz) = 221002
+TIMESTAMP = 1639540604
+SHA256 (fennel-1.0.0.tar.gz) = db01b6c363d31deb105f7918bc6acc7d996adc97da71aa5d08e82a9458077553
+SIZE (fennel-1.0.0.tar.gz) = 243719
diff --git a/lang/fennel/files/patch-Makefile b/lang/fennel/files/patch-Makefile
index 33ca6f047f0a..734f7235782d 100644
--- a/lang/fennel/files/patch-Makefile
+++ b/lang/fennel/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	2021-08-20 14:24:55 UTC
+--- Makefile.orig	2021-12-21 14:46:27 UTC
 +++ Makefile
-@@ -57,7 +57,7 @@ LUA_INCLUDE_DIR ?= $(LUA_DIR)/src
+@@ -61,7 +61,7 @@ lint:
  
- PATH_ARGS=FENNEL_PATH=src/?.fnl FENNEL_MACRO_PATH=src/?.fnl
- 
--fennel-bin: src/launcher.fnl fennel $(STATIC_LUA_LIB)
-+fennel-bin: src/launcher.fnl fennel
- 	$(PATH_ARGS) ./fennel --no-compiler-sandbox --compile-binary \
- 		$< $@ $(STATIC_LUA_LIB) $(LUA_INCLUDE_DIR)
+ ## Binaries
  
+-LUA_VERSION=5.4.3
++LUA_VERSION ?= 5.4.3
+ LUA_DIR ?= $(PWD)/lua-$(LUA_VERSION)
+ NATIVE_LUA_LIB ?= $(LUA_DIR)/src/liblua-native.a
+ LUA_INCLUDE_DIR ?= $(LUA_DIR)/src
diff --git a/lang/fennel/pkg-plist b/lang/fennel/pkg-plist
index 36a8e191d175..901361d6d59c 100644
--- a/lang/fennel/pkg-plist
+++ b/lang/fennel/pkg-plist
@@ -1,4 +1,3 @@
 bin/fennel
-lib/fennel.lua
-lib/fennelview.lua
+%%LUA_MODSHAREDIR%%/fennel.lua
 man/man1/fennel.1.gz