diff --git a/devel/fnc/Makefile b/devel/fnc/Makefile index 8808cc53a9a2..a4850df163ca 100644 --- a/devel/fnc/Makefile +++ b/devel/fnc/Makefile @@ -1,32 +1,36 @@ PORTNAME= fnc DISTVERSION= 0.18 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://fnc.bsdbox.org/tarball/${DISTVERSION}/ \ https://distfiles.pirateparty.in/ashish/ MAINTAINER= ashish@FreeBSD.org COMMENT= Interactive ncurses browser for Fossil repositories 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 PLIST_FILES= bin/fnc \ share/man/man1/fnc.1.gz # For patch application post-extract: + ${RM} ${WRKSRC}/lib/sqlite3.* ${REINPLACE_CMD} -e '/^VERSION/s/${DISTVERSION}$$/%%VERSION%%/' \ ${WRKSRC}/fnc.bld.mk pre-build: ${REINPLACE_CMD} -e '/^VERSION/s/%%VERSION%%/${DISTVERSION}/' \ -e 's,%%PREFIX%%,${PREFIX},' \ ${WRKSRC}/fnc.bld.mk .include 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,26 +1,56 @@ ---- 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 # CONFIGURATION CC ?= cc -PREFIX ?= /usr/local +PREFIX ?= %%PREFIX%% 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" install: - mkdir -p -m 0755 ${PREFIX}/bin - mkdir -p -m 0755 ${PREFIX}${MANDIR}/man1 - install -s -m 0755 src/fnc ${PREFIX}/bin/fnc - install -m 0644 src/fnc.1 ${PREFIX}${MANDIR}/man1/fnc.1 + mkdir -p -m 0755 ${DESTDIR}${PREFIX}/bin + mkdir -p -m 0755 ${DESTDIR}${PREFIX}${MANDIR}/man1 + install -s -m 0755 src/fnc ${DESTDIR}${PREFIX}/bin/fnc + install -m 0644 src/fnc.1 ${DESTDIR}${PREFIX}${MANDIR}/man1/fnc.1 uninstall: rm -f ${PREFIX}/bin/fnc ${PREFIX}${MANDIR}/man1/fnc.1