Date: Mon, 26 Jan 2026 23:00:38 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8a6ffe8081c9 - main - devel/fnc: unbundle sqlite3 Message-ID: <6977f216.39f68.198cc9be@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a6ffe8081c9a5d61f5d280b1578ed72c19f6303 commit 8a6ffe8081c9a5d61f5d280b1578ed72c19f6303 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-01-23 20:50:32 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-01-26 22:59:49 +0000 devel/fnc: unbundle sqlite3 PR: 290972 Approved by: ashish (maintainer) MFH: 2026Q1 --- devel/fnc/Makefile | 6 +++++- devel/fnc/files/patch-fnc.bld.mk | 32 +++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/devel/fnc/Makefile b/devel/fnc/Makefile index 8808cc53a9a2..a4850df163ca 100644 --- a/devel/fnc/Makefile +++ b/devel/fnc/Makefile @@ -1,5 +1,6 @@ PORTNAME= fnc DISTVERSION= 0.18 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://fnc.bsdbox.org/tarball/${DISTVERSION}/ \ https://distfiles.pirateparty.in/ashish/ @@ -11,7 +12,9 @@ WWW= https://fnc.bsdbox.org/ LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -USES= ncurses +LIB_DEPENDS= libsqlite3.so:databases/sqlite3 + +USES= localbase:ldflags ncurses MAKE_JOBS_UNSAFE= yes CFLAGS+= -Wno-error=gnu-statement-expression @@ -21,6 +24,7 @@ PLIST_FILES= bin/fnc \ # For patch application post-extract: + ${RM} ${WRKSRC}/lib/sqlite3.* ${REINPLACE_CMD} -e '/^VERSION/s/${DISTVERSION}$$/%%VERSION%%/' \ ${WRKSRC}/fnc.bld.mk diff --git a/devel/fnc/files/patch-fnc.bld.mk b/devel/fnc/files/patch-fnc.bld.mk index 0b121672e52a..8d9093d382bd 100644 --- a/devel/fnc/files/patch-fnc.bld.mk +++ b/devel/fnc/files/patch-fnc.bld.mk @@ -1,4 +1,4 @@ ---- fnc.bld.mk.orig 2024-09-25 08:28:03 UTC +--- fnc.bld.mk.orig 2026-01-23 20:37:32 UTC +++ fnc.bld.mk @@ -4,7 +4,7 @@ CC ?= cc @@ -9,6 +9,36 @@ MANDIR ?= /share/man VERSION ?= %%VERSION%% HASH != cut -f 1 manifest.uuid +@@ -47,7 +47,7 @@ FNC_CFLAGS = ${CFLAGS} -Wstrict-prototypes -Wmissing-p + -Wunused-variable -I./lib -I./include -I/usr/include/ncursesw \ + -DFNC_VERSION=${VERSION} -DFNC_HASH=${HASH} -DFNC_DATE="${DATE}" + +-FNC_LDFLAGS = ${LDFLAGS} -lm -lutil -lz -lpthread ++FNC_LDFLAGS = ${LDFLAGS} -lm -lutil -lz -lpthread -lsqlite3 + + # Compile-time checks and runtime protection mechanisms from the compiler + # hardening document: https://best.openssf.org/Compiler-Hardening-Guides +@@ -63,7 +63,7 @@ all: bin + + all: bin + +-bin: lib/sqlite3.o lib/libfossil.o src/fnc.o src/fnc ++bin: lib/libfossil.o src/fnc.o src/fnc + + lib/sqlite3.o: lib/sqlite3.c lib/sqlite3.h + ${CC} ${SQLITE_CFLAGS} -c $< -o $@ +@@ -85,9 +85,9 @@ src/fnc: src/fnc.o src/diff.o src/error.o compat/reall + ${CC} ${FNC_CFLAGS} -c $< -o $@ + + src/fnc: src/fnc.o src/diff.o src/error.o compat/reallocarray.o \ +- lib/libfossil.o lib/sqlite3.o fnc.bld.mk ++ lib/libfossil.o fnc.bld.mk + ${CC} -o $@ src/fnc.o src/diff.o src/error.o compat/reallocarray.o \ +- lib/libfossil.o lib/sqlite3.o ${FNC_LDFLAGS} ++ lib/libfossil.o ${FNC_LDFLAGS} + + dev: + ${MAKE} GOHARD=1 @@ -114,10 +114,10 @@ install: @echo "generated compile_commands.json"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6977f216.39f68.198cc9be>