Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Jan 2024 20:27:28 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 41eae8e7cac2 - main - japanese/nkf: Sanitize MANPREFIX
Message-ID:  <202401222027.40MKRSFk012725@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=41eae8e7cac2517b43fcfb2dadc0dc34b3c78c6a

commit 41eae8e7cac2517b43fcfb2dadc0dc34b3c78c6a
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-22 19:29:00 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-22 20:26:41 +0000

    japanese/nkf: Sanitize MANPREFIX
    
    Approved by:    portmgr (blanket)
---
 japanese/nkf/Makefile             | 3 ++-
 japanese/nkf/files/patch-Makefile | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile
index 252f40542353..62ff1ca3e268 100644
--- a/japanese/nkf/Makefile
+++ b/japanese/nkf/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	nkf
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES?=	japanese
 
@@ -16,6 +17,6 @@ GH_TAGNAME=	v${PORTVERSION:C/\./_/g}
 
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		ICONV_CMD="${ICONV_CMD}"
-PLIST_FILES=	bin/nkf man/man1/nkf.1.gz man/ja.UTF-8/man1/nkf.1.gz
+PLIST_FILES=	bin/nkf share/man/man1/nkf.1.gz share/man/ja/man1/nkf.1.gz
 
 .include <bsd.port.mk>
diff --git a/japanese/nkf/files/patch-Makefile b/japanese/nkf/files/patch-Makefile
index dc419584d000..30da909591b9 100644
--- a/japanese/nkf/files/patch-Makefile
+++ b/japanese/nkf/files/patch-Makefile
@@ -15,7 +15,7 @@
 -prefix = /usr/local
 +MKDIR ?= mkdir
 +prefix = $(DESTDIR)$(PREFIX)
-+manprefix = $(DESTDIR)$(MANPREFIX)
++manprefix = $(DESTDIR)$(PREFIX)/share
  PYTHON2 = python
  PYTHON3 = python
 +BSD_INSTALL_PROGRAM?= ${INSTALL} -s -o root -g wheel -m 555
@@ -52,9 +52,9 @@
 +	${ICONV_CMD} -f iso-2022-jp -t utf-8 < $? > $@
 +
 +install-man-ja: nkf.1u
-+	-$(MKDIR) $(manprefix)/man/ja.UTF-8
-+	-$(MKDIR) $(manprefix)/man/ja.UTF-8/man1
-+	${BSD_INSTALL_MAN} nkf.1u $(manprefix)/man/ja.UTF-8/man1/nkf.1
++	-$(MKDIR) $(manprefix)/man/ja
++	-$(MKDIR) $(manprefix)/man/ja/man1
++	${BSD_INSTALL_MAN} nkf.1u $(manprefix)/man/ja/man1/nkf.1
  
  shar:
  	-mkdir nkf-$(VERSION)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401222027.40MKRSFk012725>