git: 6cd7e3c7a43f - main - desthack: stop using MANPREFIX

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Thu, 11 Jan 2024 08:23:53 UTC
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6cd7e3c7a43f8b1e0b1d9cbb35962ef8001f6fa2

commit 6cd7e3c7a43f8b1e0b1d9cbb35962ef8001f6fa2
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-11 08:23:13 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-01-11 08:23:51 +0000

    desthack: stop using MANPREFIX
    
    While here prefer share/man over man for manpages
---
 Mk/Uses/desthack.mk            |  2 +-
 archivers/dact/Makefile        |  2 +-
 archivers/dact/pkg-plist       |  2 +-
 devel/ctags/Makefile           |  1 +
 devel/ctags/pkg-plist          |  2 +-
 devel/cvswrap/Makefile         |  1 +
 devel/cvswrap/pkg-plist        |  4 ++--
 devel/quilt/Makefile           |  2 +-
 devel/quilt/pkg-plist          |  4 ++--
 devel/rcs57/Makefile           |  1 +
 devel/str/Makefile             |  2 +-
 devel/str/pkg-plist            |  4 ++--
 devel/xwpe/Makefile            |  1 +
 devel/xwpe/pkg-plist           |  8 ++++----
 dns/totd/Makefile              |  4 ++--
 japanese/less/Makefile         |  3 ++-
 lang/awka/Makefile             |  2 +-
 lang/awka/pkg-plist            |  6 +++---
 misc/logsurfer/Makefile        |  2 +-
 misc/logsurfer/pkg-plist       |  4 ++--
 shells/es/Makefile             |  4 ++--
 sysutils/zisofs-tools/Makefile | 10 +++-------
 textproc/mxml/Makefile         |  1 +
 textproc/mxml/pkg-plist        |  2 +-
 www/hypermail/Makefile         |  2 +-
 www/hypermail/pkg-plist        |  4 ++--
 26 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/Mk/Uses/desthack.mk b/Mk/Uses/desthack.mk
index a8c327422652..e4cb32f589f6 100644
--- a/Mk/Uses/desthack.mk
+++ b/Mk/Uses/desthack.mk
@@ -14,5 +14,5 @@ IGNORE=	USES=desthack does not require args
 .  endif
 
 GNU_CONFIGURE_PREFIX=	\$${${DESTDIRNAME}}${PREFIX}
-GNU_CONFIGURE_MANPREFIX=	\$${${DESTDIRNAME}}${MANPREFIX}
+GNU_CONFIGURE_MANPREFIX=	\$${${DESTDIRNAME}}${PREFIX}/share
 .endif
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index 503131ecd879..f37c3637f7b4 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dact
 PORTVERSION=	0.8.42
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rkeene.org/files/oss/dact/release/
 
diff --git a/archivers/dact/pkg-plist b/archivers/dact/pkg-plist
index d568c695b85e..f02b191a4c98 100644
--- a/archivers/dact/pkg-plist
+++ b/archivers/dact/pkg-plist
@@ -1,7 +1,7 @@
 bin/dact
 @sample etc/dact.conf.sample
 lib/libdact.so
-man/man1/dact.1.gz
+share/man/man1/dact.1.gz
 %%DATADIR%%/cipher_chaos.so
 %%DATADIR%%/cipher_psub.so
 %%DATADIR%%/cipher_serpent.so
diff --git a/devel/ctags/Makefile b/devel/ctags/Makefile
index 410483c87eee..15ffa2b3aec4 100644
--- a/devel/ctags/Makefile
+++ b/devel/ctags/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ctags
 PORTVERSION=	5.8
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
diff --git a/devel/ctags/pkg-plist b/devel/ctags/pkg-plist
index e829e10bd898..6b9cac2d69ad 100644
--- a/devel/ctags/pkg-plist
+++ b/devel/ctags/pkg-plist
@@ -1,4 +1,4 @@
 bin/exctags
 include/readtags.h
 lib/readtags.o
-man/man1/exctags.1.gz
+share/man/man1/exctags.1.gz
diff --git a/devel/cvswrap/Makefile b/devel/cvswrap/Makefile
index c214eed39533..9901f2bee267 100644
--- a/devel/cvswrap/Makefile
+++ b/devel/cvswrap/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cvswrap
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES+=	LOCAL/alfred
 
diff --git a/devel/cvswrap/pkg-plist b/devel/cvswrap/pkg-plist
index f27b56f31cfd..d95d0381956a 100644
--- a/devel/cvswrap/pkg-plist
+++ b/devel/cvswrap/pkg-plist
@@ -1,5 +1,5 @@
 bin/cvswrap
-man/man1/cvswrap.1.gz
-man/man5/cvswrap.conf.5.gz
+share/man/man1/cvswrap.1.gz
+share/man/man5/cvswrap.conf.5.gz
 share/examples/cvswrap/accesscheck.c
 share/examples/cvswrap/cvswrap.conf
diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile
index 0bb3a31de335..124ba9058ffb 100644
--- a/devel/quilt/Makefile
+++ b/devel/quilt/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	quilt
 PORTVERSION=	0.67
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SAVANNAH
 
diff --git a/devel/quilt/pkg-plist b/devel/quilt/pkg-plist
index e0021a44eac1..f04505de48b7 100644
--- a/devel/quilt/pkg-plist
+++ b/devel/quilt/pkg-plist
@@ -2,8 +2,8 @@ bin/guards
 bin/quilt
 etc/bash_completion.d/quilt
 etc/quilt.quiltrc
-man/man1/guards.1.gz
-man/man1/quilt.1.gz
+share/man/man1/guards.1.gz
+share/man/man1/quilt.1.gz
 share/emacs/site-lisp/quilt.el
 %%NLS%%share/locale/de/LC_MESSAGES/quilt.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/quilt.mo
diff --git a/devel/rcs57/Makefile b/devel/rcs57/Makefile
index d23de5c63165..7cfa48110b1d 100644
--- a/devel/rcs57/Makefile
+++ b/devel/rcs57/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	rcs
 PORTVERSION=	5.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	57
diff --git a/devel/str/Makefile b/devel/str/Makefile
index d4d25f83255c..27d3720137f3 100644
--- a/devel/str/Makefile
+++ b/devel/str/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	str
 PORTVERSION=	0.9.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	OSSP/lib/${PORTNAME}
 
diff --git a/devel/str/pkg-plist b/devel/str/pkg-plist
index 41b12bd2acbb..ec769106fc0b 100644
--- a/devel/str/pkg-plist
+++ b/devel/str/pkg-plist
@@ -4,5 +4,5 @@ lib/libstr.a
 lib/libstr.so
 lib/libstr.so.9
 lib/libstr.so.9.0.32
-man/man1/str-config.1.gz
-man/man3/str.3.gz
+share/man/man1/str-config.1.gz
+share/man/man3/str.3.gz
diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile
index d4127fbeb3f6..758701a3d6a8 100644
--- a/devel/xwpe/Makefile
+++ b/devel/xwpe/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xwpe
 PORTVERSION=	1.5.30a
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SUNSITE/apps/editors/X \
 		http://www.identicalsoftware.com/xwpe/ \
diff --git a/devel/xwpe/pkg-plist b/devel/xwpe/pkg-plist
index ed8856fa74cb..6401eaac38e2 100644
--- a/devel/xwpe/pkg-plist
+++ b/devel/xwpe/pkg-plist
@@ -2,10 +2,10 @@ bin/we
 bin/wpe
 bin/xwe
 bin/xwpe
-man/man1/we.1.gz
-man/man1/wpe.1.gz
-man/man1/xwe.1.gz
-man/man1/xwpe.1.gz
+share/man/man1/we.1.gz
+share/man/man1/wpe.1.gz
+share/man/man1/xwe.1.gz
+share/man/man1/xwpe.1.gz
 %%DATADIR%%/help.key
 %%DATADIR%%/help.xwpe
 %%DATADIR%%/syntax_def
diff --git a/dns/totd/Makefile b/dns/totd/Makefile
index 4fe442039c0c..411cec51a5cf 100644
--- a/dns/totd/Makefile
+++ b/dns/totd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	totd
 PORTVERSION=	1.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
 MASTER_SITES=	https://BSDforge.com/projects/source/dns/totd/
 
@@ -16,7 +16,7 @@ USE_RC_SUBR=	totd
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	"@sample etc/totd.conf.sample" \
-		man/man8/totd.8.gz \
+		share/man/man8/totd.8.gz \
 		sbin/totd
 
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-ne_mesg.c \
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 0a87f26b9350..99afd20167f2 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	less
 PORTVERSION=	382.262.03.01
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	japanese
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -17,7 +18,7 @@ CONFIGURE_ARGS=	--with-cs-regex
 PORTDOCS=	README.iso README.iso.jp README.lesw.euc \
 		README.regex README.regex.jp README.ext.jp
 PLIST_FILES=	bin/jless bin/jlesskey bin/jlessecho \
-		man/man1/jless.1.gz man/man1/jlesskey.1.gz
+		share/man/man1/jless.1.gz share/man/man1/jlesskey.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/lang/awka/Makefile b/lang/awka/Makefile
index 2fbac34365f1..48222f5ec468 100644
--- a/lang/awka/Makefile
+++ b/lang/awka/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	awka
 PORTVERSION=	0.7.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://awka.sourceforge.net/
 
diff --git a/lang/awka/pkg-plist b/lang/awka/pkg-plist
index f469fd003404..c4492cbfda68 100644
--- a/lang/awka/pkg-plist
+++ b/lang/awka/pkg-plist
@@ -2,6 +2,6 @@ bin/awka
 lib/libawka.a
 lib/libawka.so
 include/libawka.h
-man/man1/awka.1.gz
-man/man5/awka-elm.5.gz
-man/man5/awka-elmref.5.gz
+share/man/man1/awka.1.gz
+share/man/man5/awka-elm.5.gz
+share/man/man5/awka-elmref.5.gz
diff --git a/misc/logsurfer/Makefile b/misc/logsurfer/Makefile
index cf0896763bdc..6c926a16e18c 100644
--- a/misc/logsurfer/Makefile
+++ b/misc/logsurfer/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	logsurfer
 PORTVERSION=	1.8
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://www.crypt.gen.nz/logsurfer/ \
 		ZI
diff --git a/misc/logsurfer/pkg-plist b/misc/logsurfer/pkg-plist
index 8239e9648a6c..594dc96c233e 100644
--- a/misc/logsurfer/pkg-plist
+++ b/misc/logsurfer/pkg-plist
@@ -1,5 +1,5 @@
 bin/logsurfer
-man/man1/logsurfer.1.gz
-man/man4/logsurfer.conf.4.gz
+share/man/man1/logsurfer.1.gz
+share/man/man4/logsurfer.conf.4.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/shells/es/Makefile b/shells/es/Makefile
index 7f93c96c0078..fe00da042925 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	es
 PORTVERSION=	0.9.b1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.sys.toronto.edu/pub/es/
 DISTNAME=	es-0.9-beta1
@@ -16,6 +16,6 @@ CONFIGURE_ARGS=	--with-readline
 CFLAGS:=	${CFLAGS:N-O*}
 ALL_TARGET=	es
 
-PLIST_FILES=	bin/es man/man1/es.1.gz
+PLIST_FILES=	bin/es share/man/man1/es.1.gz
 
 .include <bsd.port.mk>
diff --git a/sysutils/zisofs-tools/Makefile b/sysutils/zisofs-tools/Makefile
index 3fc30fb81c21..4a3d1eada34e 100644
--- a/sysutils/zisofs-tools/Makefile
+++ b/sysutils/zisofs-tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	zisofs-tools
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	KERNEL_ORG/linux/utils/fs/zisofs
 
@@ -15,17 +15,13 @@ GNU_CONFIGURE=	yes
 MAKE_ARGS+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 
 PLIST_FILES=	bin/mkzftree \
-		man/man1/mkzftree.1.gz
+		share/man/man1/mkzftree.1.gz
 
 OPTIONS_DEFINE=	LFS DOCS
 OPTIONS_DEFAULT=	LFS
 LFS_DESC=	Enable Large Files Support
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MLFS}
-CONFIGURE_ARGS+=	--disable-largefile
-.endif
+LFS_CONFIGURE_ENABLE=	largefile
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/textproc/mxml/Makefile b/textproc/mxml/Makefile
index 7c335391a476..48b6e3a85c24 100644
--- a/textproc/mxml/Makefile
+++ b/textproc/mxml/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mxml
 DISTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/michaelrsweet/mxml/releases/download/v${DISTVERSION}/
 
diff --git a/textproc/mxml/pkg-plist b/textproc/mxml/pkg-plist
index 8b1d785e30c1..7ae539ca5546 100644
--- a/textproc/mxml/pkg-plist
+++ b/textproc/mxml/pkg-plist
@@ -4,7 +4,7 @@ lib/libmxml.so
 lib/libmxml.so.1
 lib/libmxml.so.1.6
 libdata/pkgconfig/mxml.pc
-man/man3/mxml.3.gz
+share/man/man3/mxml.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 @comment %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE
diff --git a/www/hypermail/Makefile b/www/hypermail/Makefile
index 025d7be879ec..e0a318d228e4 100644
--- a/www/hypermail/Makefile
+++ b/www/hypermail/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hypermail
 PORTVERSION=	2.4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www mail
 
 MAINTAINER=	bapt@FreeBSD.org
diff --git a/www/hypermail/pkg-plist b/www/hypermail/pkg-plist
index d75fc791b4b1..0cd170148f33 100644
--- a/www/hypermail/pkg-plist
+++ b/www/hypermail/pkg-plist
@@ -1,8 +1,8 @@
 bin/hypermail
 bin/msg2archive
 bin/rdmsg
-man/man1/hypermail.1.gz
-man/man4/hmrc.4.gz
+share/man/man1/hypermail.1.gz
+share/man/man4/hmrc.4.gz
 %%PORTDOCS%%%%DOCSDIR%%/archive_search.html
 %%PORTDOCS%%%%DOCSDIR%%/customizing.html
 %%PORTDOCS%%%%DOCSDIR%%/hmrc.html