From nobody Tue Dec 21 15:36:42 2021 X-Original-To: dev-commits-ports-main@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 0B1E1190F5B1; Tue, 21 Dec 2021 15:36:43 +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 4JJLCt508Rz3r6D; Tue, 21 Dec 2021 15:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8B63B4515; Tue, 21 Dec 2021 15:36:42 +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 1BLFagUq086979; Tue, 21 Dec 2021 15:36:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BLFagOH086978; Tue, 21 Dec 2021 15:36:42 GMT (envelope-from git) Date: Tue, 21 Dec 2021 15:36:42 GMT Message-Id: <202112211536.1BLFagOH086978@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: ae37f26f9e42 - main - lang/fennel: Update to 1.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae37f26f9e4294e96ee0ef62870d333251be1154 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640101002; 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=5pDfWW9OiLKsL/4zBUSrALnoA3Xp5xqoOrylE3yru/8=; b=OBVPB6/llmOMjZlMwSv9JaMhciz6A6QfiPDCokDQE6UrrXFANLzOAavUpj+DPWz/pa90mU pqggXZTTKtc8FPoqgxdE4hVLAHX2WMJE362O4RCWmx76pigco/dwdtXzzIZkvUWUTEON9W oMUmssl2YNVFOXZhEeczAG3QPNCtlrLq5HQ0oOtNVWH/h7wUsewvjQhc07pN816x1bdoV8 DXSgbOsllpZM5r+GwnkC90lbeTRQMP0BQpOr1CARLh0HghcrC8xFjy80nMTdqEr9oQsuKT 1vPue2QXATA62Y1Gg+ZWQYxBygk1DizUSaIdO6lI8TqvKc8Ck7tvgSJzj4b/6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640101002; a=rsa-sha256; cv=none; b=tEBquZgD+RrS38VaKb2mPFtGUBLXmKtzXp9Gg/98GtbhRTgk+teUaDiC8ylnT1194GR8jE GXcctGaq8t8C/ZbaGhaASXdlALtJZZWMv91nSF4f+P46b4CEy+XwgK+Jq0pYsO7zzxxXiG 7lICoAwCOhSC7kUHQJC4NtHml6xbyEJZITh+3F9g8sQwdz0sN4LbjdXSO7d0DbhuRMRQXa 9urXeQbkjkOQCSaqfBI5QbG+rd9Md7isyyN7MpE6v6SOZbBMu4naanZZxpcp2Nyd+rFox4 AuZYnplFZiUlFyVhp/bHUmRH65C5E6ms5If1NDB/GqV4vMs+w5jeHWns95zjZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae37f26f9e4294e96ee0ef62870d333251be1154 commit ae37f26f9e4294e96ee0ef62870d333251be1154 Author: Joseph Mingrone AuthorDate: 2021-12-16 20:44:47 +0000 Commit: Joseph Mingrone 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 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