Date: Sat, 06 Jun 2026 11:49:01 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Jamie Landeg-Jones <jamie@catflap.org> Subject: git: 6f999bf845f0 - main - devel/cgit: Fix builds in live environment, and add LUA option Message-ID: <6a24092d.2293a.7bd3b2e4@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=6f999bf845f0c1082bb2a9e2cde353d993d9d6f2 commit 6f999bf845f0c1082bb2a9e2cde353d993d9d6f2 Author: Jamie Landeg-Jones <jamie@catflap.org> AuthorDate: 2026-06-06 11:35:10 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-06-06 11:47:54 +0000 devel/cgit: Fix builds in live environment, and add LUA option - Remove adding of "openssl" directories to git subtree. openssl isn't necessary here, and the resultant include of "/usr/local/include" poisions the git tree, causing it to not compile. - Add option to add the lua / luajit engine to the install. - Reformat to satisfy portclippy and portfmt. PR: 293666 Approved by: Marko Turk <mt-bugs@markoturk.info> (maintainer) Sponsored by: UNIS Labs Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org> --- devel/cgit/Makefile | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile index cc33a651ddb7..5a03d6de8e59 100644 --- a/devel/cgit/Makefile +++ b/devel/cgit/Makefile @@ -1,9 +1,10 @@ PORTNAME= cgit -PORTVERSION= 1.3 +DISTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= devel www MASTER_SITES= http://git.zx2c4.com/cgit/snapshot/:cgit \ KERNEL_ORG/software/scm/git:git -DISTFILES= cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \ +DISTFILES= cgit-${DISTVERSION}${EXTRACT_SUFX}:cgit \ git-${GIT_VERSION}${EXTRACT_SUFX}:git MAINTAINER= mt-bugs@markoturk.info @@ -25,21 +26,34 @@ SHEBANG_FILES= filters/email-gravatar.py \ filters/html-converters/rst2html \ filters/syntax-highlighting.py -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} MAKE_ARGS+= CGIT_SCRIPT_PATH=${WWWDIR} CGIT_CONFIG=${PREFIX}/etc/cgitrc \ - prefix=${PREFIX} NO_GETTEXT=1 NO_LUA=1 NO_R_TO_GCC_LINKER=1 V=1 + prefix=${PREFIX} NO_GETTEXT=1 NO_R_TO_GCC_LINKER=1 V=1 SUB_FILES= pkg-message PORTDOCS= ${PORTNAME}rc.5.txt -OPTIONS_DEFINE= DOCS ASCIIDOC +OPTIONS_DEFINE= ASCIIDOC DOCS OPTIONS_DEFAULT= ASCIIDOC -OPTIONS_SUB= yes +OPTIONS_RADIO= LUAS +OPTIONS_RADIO_LUAS= LUA LUAJIT +OPTIONS_SUB= yes ASCIIDOC_DESC= Use asciidoc to preprocess man page +LUAJIT_DESC= ${LUA_DESC} using luajit engine +LUAS_DESC= ${LUA_DESC} + ASCIIDOC_BUILD_DEPENDS= a2x:textproc/asciidoc +LUAJIT_USES= luajit pkgconfig +LUAJIT_MAKE_ARGS= LUA_PKGCONFIG=luajit +LUA_USES= lua pkgconfig +LUA_MAKE_ARGS= LUA_PKGCONFIG=lua-${LUA_VER} + +.include <bsd.port.options.mk> + +.if !${PORT_OPTIONS:MLUA*} +MAKE_ARGS+= NO_LUA=1 +.endif post-extract: @${RMDIR} ${WRKSRC}/git @@ -50,19 +64,17 @@ post-patch: ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' \ - -e "s|\(ALL_CFLAGS =\)|\1 -I${OPENSSLINC}|g" \ - -e "s|\(ALL_LDFLAGS =\)|\1 -L${OPENSSLLIB}|g" \ ${WRKSRC}/git/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${WWWDIR}/cgit.cgi -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - post-install-ASCIIDOC-on: a2x --doctype manpage --format manpage ${WRKSRC}/cgitrc.5.txt ${INSTALL_MAN} ${WRKSRC}/cgitrc.5 ${STAGEDIR}${PREFIX}/share/man/man5 +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + .include <bsd.port.mk>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a24092d.2293a.7bd3b2e4>