update lang/fennel to 1.3.1

Move the man pages to a subpackage -docs since they don't depend
on the lua version (i.e. the FLAVOR.)

Discussed with ingo and sthen, clues/ok sthen
master
op 2023-09-19 20:56:36 +00:00
parent 7bdb780d96
commit a86e1d0802
7 changed files with 38 additions and 13 deletions

View File

@ -1,8 +1,14 @@
COMMENT = Lisp dialect that runs on Lua ${MODLUA_VERSION}
COMMENT-main = Lisp dialect that runs on Lua ${MODLUA_VERSION}
COMMENT-docs = Documentation for fennel
V = 1.2.1
PKGNAME = fennel-$V
FULLPKGNAME = fennel-${FLAVOR}-${V}
V = 1.3.1
DIST_TUPLE = srht technomancy fennel $V .
FULLPKGPATH-main = lang/fennel,-main,${FLAVOR}
FULLPKGNAME-main = fennel-${FLAVOR}-${V}
# -docs isn't flavoured, so overwrite its default name/path
FULLPKGNAME-docs = fennel-docs-$V
FULLPKGPATH-docs = ${PKGPATH},-docs
CATEGORIES = lang
@ -13,9 +19,7 @@ MAINTAINER = Omar Polo <op@openbsd.org>
# MIT
PERMIT_PACKAGE = Yes
MASTER_SITES = https://git.sr.ht/~technomancy/fennel/archive/
DISTFILES = fennel-{}$V${EXTRACT_SUFX}
MULTI_PACKAGES = -main -docs
MODULES = lang/lua
@ -29,13 +33,14 @@ ALL_TARGET = build
MAKE_FLAGS += LUA=${MODLUA_BIN} \
LUA_VERSION=${MODLUA_VERSION} \
LUA_LIB_DIR=${MODLUA_LIBDIR}
FAKE_FLAGS += PREFIX=${TRUEPREFIX}
FAKE_FLAGS += PREFIX=${TRUEPREFIX} \
MAN_DIR=${PREFIX}
WRKDIST = ${WRKDIR}/${PKGNAME}
RUN_DEPENDS-main+= lang/fennel,-docs
RUN_DEPENDS-docs =
post-install:
chmod +x ${PREFIX}/bin/fennel
cd ${PREFIX}/bin && mv fennel fennel-${MODLUA_VERSION}
cd ${PREFIX}/man/man1 && mv fennel.1 fennel-${MODLUA_VERSION}.1
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (fennel-1.2.1.tar.gz) = ZlSq23ZZu/iNOHkZA5JXPhrjkIfqr1CE6V9F246CrVE=
SIZE (fennel-1.2.1.tar.gz) = 271590
SHA256 (technomancy-fennel-1.3.1.tar.gz) = gz2Qt+me3Uh0A/Uf38PLsmO/lltyqRS7u7AVbGEy1GU=
SIZE (technomancy-fennel-1.3.1.tar.gz) = 293564

View File

@ -0,0 +1,15 @@
don't run git during the regress suite.
Index: test/irc.lua
--- test/irc.lua.orig
+++ test/irc.lua
@@ -5,8 +5,7 @@ local url = os.getenv("JOB_URL") or "???"
local origin_job_prefix = 'https://builds.sr.ht/technomancy/job/'
local is_origin = url:sub(1, #origin_job_prefix) == origin_job_prefix
-local branch = io.popen("git rev-parse --abbrev-ref HEAD"):read('*a')
-local is_main = branch == 'main'
+local is_main = false
-- This may fail in future if libera chat once again blocks builds.sr.ht
-- from connecting; it currently works after we asked them to look into it

View File

@ -0,0 +1 @@
Manual pages for fennel.

View File

@ -0,0 +1,4 @@
@man man/man1/fennel.1
@man man/man3/fennel-api.3
@man man/man5/fennel-reference.5
@man man/man7/fennel-tutorial.7

View File

@ -1,3 +1,3 @@
@pkgpath lang/fennel
bin/fennel-${MODLUA_VERSION}
lib/lua/${MODLUA_VERSION}/fennel.lua
@man man/man1/fennel-${MODLUA_VERSION}.1