git: 239baef48724 - main - devel/fnc: Sanitize MANPREFIX

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sun, 21 Jan 2024 12:51:24 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=239baef4872472b873fd0ef1a44842c5ec6a7ab4

commit 239baef4872472b873fd0ef1a44842c5ec6a7ab4
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-21 02:22:17 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-21 12:51:14 +0000

    devel/fnc: Sanitize MANPREFIX
    
    Approved by:    portmgr (blanket)
---
 devel/fnc/Makefile               | 3 ++-
 devel/fnc/files/patch-fnc.bld.mk | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/devel/fnc/Makefile b/devel/fnc/Makefile
index acff863f8c83..0142aad64958 100644
--- a/devel/fnc/Makefile
+++ b/devel/fnc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	fnc
 DISTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://fnc.bsdbox.org/tarball/${DISTVERSION}/ \
 		https://distfiles.pirateparty.in/ashish/
@@ -15,7 +16,7 @@ USES=		ncurses
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/fnc \
-		man/man1/fnc.1.gz
+		share/man/man1/fnc.1.gz
 
 # For patch application
 post-extract:
diff --git a/devel/fnc/files/patch-fnc.bld.mk b/devel/fnc/files/patch-fnc.bld.mk
index d93e2c974d67..ca89c68baaa8 100644
--- a/devel/fnc/files/patch-fnc.bld.mk
+++ b/devel/fnc/files/patch-fnc.bld.mk
@@ -1,13 +1,13 @@
 --- fnc.bld.mk.orig	2023-11-27 08:16:26 UTC
 +++ fnc.bld.mk
 @@ -4,8 +4,8 @@ CC ?=		cc
- 
+
  # CONFIGURATION
  CC ?=		cc
 -PREFIX ?=	/usr/local
 -MANDIR ?=	/share/man
 +PREFIX ?=	%%PREFIX%%
-+MANDIR ?=	/man
++MANDIR ?=	/share/man
  VERSION ?=	%%VERSION%%
  HASH !=		cut -f 1 manifest.uuid
  DATE !=		sed '2q;d' manifest | cut -d ' ' -f 2 | tr T ' '
@@ -22,7 +22,7 @@
  		-DDATE="${DATE}"
 @@ -89,10 +89,10 @@ install:
  	@echo "generated compile_commands.json"
- 
+
  install:
 -	mkdir -p -m 0755 ${PREFIX}/bin
 -	mkdir -p -m 0755 ${PREFIX}${MANDIR}/man1
@@ -32,6 +32,6 @@
 +	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