3.16.4
Needs ReviewPublic
Actions

Authored by dave_freedave.net on Sun, Jan 11, 3:53 PM.

Details

Reviewers

adamw

Summary

updating to latest version.

couple things to note: this uses a bee.lua based on lua 5.5 (not yet in ports). This means I've been wrong all along that this required lua:build in USES. I verified that in poudriere(8).

I used GH_TAGNAME to grab a fix for locales, without it make test will have lots of stack traces (but succeed). But this does affect users (see Issue 3329).

Test Plan

passes make test on stable/14, stable/15, main.
Also verified it from neovim against my config for all of the above versions.

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

dave_freedave.net created this revision.Sun, Jan 11, 3:53 PM

Herald added a subscriber: andrew_tao173.riddles.org.uk. · View Herald TranscriptSun, Jan 11, 3:53 PM

dave_freedave.net requested review of this revision.Sun, Jan 11, 3:53 PM

dave_freedave.net edited the test plan for this revision. (Show Details)Sun, Jan 11, 5:08 PM

Removed files from patch that didn't actually change (just date change from when I ran make makepatch).

Confirmed via poudriere testport that USES does not need lua:build as it only uses its own modified bee.lua which is now based on lua 5.5.

{F141925403} is output from poudriere testport ... devel/lua-language-server.

dave_freedave.net edited the summary of this revision. (Show Details)Mon, Jan 12, 5:14 PM

dave_freedave.net edited the test plan for this revision. (Show Details)

guest-patmaddox added a subscriber: guest-patmaddox.Tue, Jan 13, 5:42 AM

I decided to change a variable name to match the Uses/inotify.mk coming in D54116. That really just meant changing LINK_INOTIFY to INOTIFY_LIB. But while at it I wanted a better variable name for what I had set as INOTIFY, so it is now LM_INOTIFY_LINK.

If D54116 arrives first I have already tested the patch to switch to it (and will update this review):

--- Makefile    2026-01-12 06:21:43.155262000 -0300
+++ M   2026-01-12 06:37:51.898022000 -0300
@@ -10,7 +10,7 @@
 LICENSE=       MIT
 LICENSE_FILE=  ${WRKSRC}/LICENSE

-USES=          dos2unix ninja:make
+USES=          dos2unix inotify ninja:make
 DOS2UNIX_REGEX=        .*\.(cpp|h|lua|md|obj|json)
 USE_GITHUB=    yes
 GH_ACCOUNT=    LuaLS
@@ -82,12 +82,9 @@
 do-test:
        cd ${WRKSRC} && 3rd/luamake/luamake unit-test

-.include <bsd.port.options.mk>
+.include <bsd.port.mk>

-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500050
-LIB_DEPENDS+=  libinotify.so:devel/libinotify
+# `luamake' has its own syntax for linking of inotify library
+.if !empty(INOTIFY_PORT)
 LM_INOTIFY_LINK=       links = "inotify",
-INOTIFY_LIB=   -linotify
 .endif
-
-.include <bsd.port.mk>