MAN?PREFIX: eleminate its usage and move man to share/man

freebsd · Jan 10, 2024 · e4610fc · e4610fc
1 parent f1f3b1f
commit e4610fc
Show file tree

Hide file tree

Showing 157 changed files with 429 additions and 372 deletions.
diff --git a/mail/py-offlineimap3/Makefile b/mail/py-offlineimap3/Makefile
@@ -72,8 +72,8 @@ post-build-DOCS-on:
 		'! ( -name .lock -or -name .buildinfo )'
 
 post-build-MANPAGES-on:
-	${MKDIR} ${STAGEDIR}${MAN7PREFIX}/share/man/man7/
-	${MKDIR} ${STAGEDIR}${MAN7PREFIX}/share/man/man1/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man7/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1/
 	cd ${WRKSRC}/docs && ${GMAKE} man && \
 	${INSTALL_MAN} offlineimapui.7 ${STAGEDIR}${PREFIX}/share/man/man7/ && \
 	${INSTALL_MAN} offlineimap.1 ${STAGEDIR}${PREFIX}/share/man/man1/

diff --git a/net/intel-ixl-kmod/Makefile b/net/intel-ixl-kmod/Makefile
@@ -53,7 +53,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/${MANPAGENAME}.4 ${STAGEDIR}${PREFIX}/share/man/man4/
 
 .for link in ${MANPAGELINKS}
-	${LN} ${STAGEDIR}${MAN4PREFIX}/share/man/man4/${MANPAGENAME}.4 ${STAGEDIR}${PREFIX}/share/man/man4/${link}.4
+	${LN} ${STAGEDIR}${PREFIX}/share/man/man4/${MANPAGENAME}.4 ${STAGEDIR}${PREFIX}/share/man/man4/${link}.4
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/net/sakisafecli/Makefile b/net/sakisafecli/Makefile
@@ -20,6 +20,6 @@ CFLAGS+=	-fPIC
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sakisafecli/sakisafecli ${STAGEDIR}${PREFIX}/bin/sakisafecli
 	${INSTALL_MAN} ${WRKSRC}/sakisafecli/sakisafecli.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/sakisafecli/sakisafeclirc.5 ${STAGEDIR}${MAN1PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/sakisafecli/sakisafeclirc.5 ${STAGEDIR}${PREFIX}/share/man/man5
 
 .include <bsd.port.mk>
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
@@ -43,8 +43,8 @@ TEST_TARGET=	check
 MAN1_DE=	leafnode-version.1 newsq.1
 MAN8_DE=	applyfilter.8 checkgroups.8 fetchnews.8 leafnode.8 texpire.8
 MANLANG=	"" de.ISO8859-1
-MAN1DIR_DE=	${MAN1PREFIX}/man/de.ISO8859-1/man1
-MAN8DIR_DE=	${MAN8PREFIX}/man/de.ISO8859-1/man8
+MAN1DIR_DE=	${PREFIX}/man/de.ISO8859-1/man1
+MAN8DIR_DE=	${PREFIX}/man/de.ISO8859-1/man8
 
 DOCS=		ADD-ONS ChangeLog COPYING CREDITS FAQ.txt FAQ.pdf FAQ.html \
 		INSTALL NEWS README ChangeLog.old README-FQDN README-FQDN.html \
@@ -75,7 +75,7 @@ post-install:
 .endif
 	${MKDIR} ${STAGEDIR}${MAN1DIR_DE} ${STAGEDIR}${MAN8DIR_DE}
 	cd ${WRKSRC}/doc_german && \
-	${INSTALL_MAN} ${MAN1_DE} ${STAGEDIR}${MAN1PREFIX}/man/de.ISO8859-1/man1 && \
-	${INSTALL_MAN} ${MAN8_DE} ${STAGEDIR}${MAN8PREFIX}/man/de.ISO8859-1/man8
+	${INSTALL_MAN} ${MAN1_DE} ${STAGEDIR}${PREFIX}/man/de.ISO8859-1/man1 && \
+	${INSTALL_MAN} ${MAN8_DE} ${STAGEDIR}${PREFIX}/man/de.ISO8859-1/man8
 
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/pkg_cutleaves/Makefile b/ports-mgmt/pkg_cutleaves/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pkg_cutleaves
 PORTVERSION=	20181216
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -15,7 +16,7 @@ NO_BUILD=	yes
 SHEBANG_FILES=	pkg_cutleaves
 NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	sbin/pkg_cutleaves man/man1/pkg_cutleaves.1.gz
+PLIST_FILES=	sbin/pkg_cutleaves share/man/man1/pkg_cutleaves.1.gz
 NO_ARCH=	yes
 
 do-extract:
@@ -34,6 +35,6 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pkg_cutleaves ${STAGEDIR}${PREFIX}/sbin/pkg_cutleaves
-	${INSTALL_MAN} ${WRKSRC}/pkg_cutleaves.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/pkg_cutleaves.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/pkg_rmleaves/Makefile b/ports-mgmt/pkg_rmleaves/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pkg_rmleaves
 PORTVERSION=	20190108
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	https://files.wittig.name/${PORTNAME}/ \
 		http://files.wittig.name/${PORTNAME}/
@@ -11,10 +12,10 @@ LICENSE=	BSD2CLAUSE
 
 NO_BUILD=	yes
 
-PLIST_FILES=	sbin/pkg_rmleaves man/man1/pkg_rmleaves.1.gz
+PLIST_FILES=	sbin/pkg_rmleaves share/man/man1/pkg_rmleaves.1.gz
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pkg_rmleaves ${STAGEDIR}${PREFIX}/sbin/pkg_rmleaves
-	${INSTALL_MAN} ${WRKSRC}/pkg_rmleaves.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/pkg_rmleaves.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/pkgcompare/Makefile b/ports-mgmt/pkgcompare/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pkgcompare
 PORTVERSION=	1.1
+PORTREVIDSION=	1
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	waitman@waitman.net
@@ -22,7 +23,7 @@ GH_TAGNAME=	418295d
 BINARY=		pkg-compare
 
 PORTDOCS=	*
-PLIST_FILES=	man/man8/pkg-compare.8.gz \
+PLIST_FILES=	share/man/man8/pkg-compare.8.gz \
 		sbin/pkg-compare
 SUB_FILES=	pkg-message
 
@@ -31,7 +32,7 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/pkg-compare.8 \
-		${STAGEDIR}${MAN8PREFIX}/man/man8
+		${STAGEDIR}${PREFIX}/share/man/man8
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 

diff --git a/ports-mgmt/portconfig/Makefile b/ports-mgmt/portconfig/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	portconfig
 DISTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	bapt@FreeBSD.org
@@ -17,10 +18,10 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	alfix
 
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	portlint
 PORTVERSION=	2.22.0
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -22,7 +23,7 @@ USE_PERL5=	run
 SRC=		${.CURDIR}/src
 
 PLIST_FILES=	bin/portlint \
-		man/man1/portlint.1.gz
+		share/man/man1/portlint.1.gz
 
 PORTEXAMPLES=	portlintgrep
 
@@ -35,7 +36,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/portlint.pl \
 	    ${STAGEDIR}${PREFIX}/bin/portlint
 	${INSTALL_MAN} ${WRKSRC}/portlint.1 \
-	    ${STAGEDIR}${MAN1PREFIX}/man/man1
+	    ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	portmaster
 PORTVERSION=	3.29
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	se@FreeBSD.org
@@ -16,7 +17,7 @@ OPTIONS_DEFAULT=BASH ZSH
 
 PLIST_FILES=	sbin/portmaster \
 		etc/portmaster.rc.sample \
-		man/man8/portmaster.8.gz
+		share/man/man8/portmaster.8.gz
 
 BASH_PLIST_FILES=	etc/bash_completion.d/portmaster.sh
 ZSH_PLIST_FILES=	share/zsh/site-functions/_portmaster
@@ -37,7 +38,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/files/portmaster.rc.sample \
 	    ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_MAN} ${WRKSRC}/files/portmaster.8 \
-	    ${STAGEDIR}${MAN8PREFIX}/man/man8
+	    ${STAGEDIR}${PREFIX}/share/man/man8
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d

diff --git a/ports-mgmt/portoptscli/Makefile b/ports-mgmt/portoptscli/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	portoptscli
 DISTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt accessibility
 
 MAINTAINER=	alfix86@gmail.com
@@ -13,10 +14,10 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	alfix
 
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portscout/Makefile b/ports-mgmt/portscout/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	portscout
 PORTVERSION=	0.8.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	bofh@FreeBSD.org
@@ -81,7 +81,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/portscout.pod ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 
 	pod2man ${WRKSRC}/portscout.pod ${WRKSRC}/portscout.1
-	${INSTALL_MAN} ${WRKSRC}/portscout.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/portscout.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}/templates
 	cd ${WRKSRC}/templates \

diff --git a/ports-mgmt/portscout/pkg-plist b/ports-mgmt/portscout/pkg-plist
@@ -1,6 +1,6 @@
 bin/portscout
 @sample etc/portscout.conf.sample
-man/man1/portscout.1.gz
+share/man/man1/portscout.1.gz
 %%DATADIR%%/templates/index.html
 %%DATADIR%%/templates/maintainer.html
 %%DATADIR%%/templates/reminder-no-maintainer.mail

diff --git a/print/c2ps/Makefile b/print/c2ps/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	c2ps
 PORTVERSION=	4.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	http://www.cs.technion.ac.il/users/c2ps/
 
@@ -12,10 +12,10 @@ LIB_DEPENDS=	libpaper.so:print/libpaper
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-PLIST_FILES=	bin/c2ps man/man1/c2ps.1.gz
+PLIST_FILES=	bin/c2ps share/man/man1/c2ps.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/c2ps ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/c2ps.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/c2ps.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/print/dvisvg/Makefile b/print/dvisvg/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dvisvg
 DISTVERSION=	0.7.1d
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	print
 MASTER_SITES=	http://dvisvg.sourceforge.net/files/
 
@@ -29,7 +29,7 @@ post-patch:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/dvisvg ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/dvisvg.man \
-	    ${STAGEDIR}${MAN1PREFIX}/man/man1/dvisvg.1
+	    ${STAGEDIR}${PREFIX}/share/man/man1/dvisvg.1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDIR}/${PORTNAME}
 .for file in dvisvg.map font2svg.enc font2svg.ps
 	${INSTALL_DATA} ${WRKSRC}/${file} \

diff --git a/print/dvisvg/pkg-plist b/print/dvisvg/pkg-plist
@@ -1,5 +1,5 @@
 bin/dvisvg
-man/man1/dvisvg.1.gz
+share/man/man1/dvisvg.1.gz
 %%TEXMFDIR%%/dvisvg/dvisvg.map
 %%TEXMFDIR%%/dvisvg/font2svg.enc
 %%TEXMFDIR%%/dvisvg/font2svg.ps
diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	html2ps
 DISTVERSION=	1.0b7
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	print www perl5
 MASTER_SITES=	LOCAL/hrs
@@ -24,8 +24,8 @@ SUB_FILES=	html2psrc
 
 PLIST_FILES=	bin/html2ps \
 		etc/html2psrc \
-		man/man1/html2ps.1.gz \
-		man/man5/html2psrc.5.gz \
+		share/man/man1/html2ps.1.gz \
+		share/man/man5/html2psrc.5.gz \
 		${DATADIR_REL}/html2ps.html \
 		${DATADIR_REL}/hyphen.tex
 
@@ -40,8 +40,8 @@ post-patch:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/html2ps ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/html2psrc ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_MAN} ${WRKSRC}/html2ps.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/html2psrc.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/html2ps.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/html2psrc.5 ${STAGEDIR}${PREFIX}/share/man/man5
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/html2ps.html ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/hyphen.tex ${STAGEDIR}${DATADIR}

diff --git a/print/latexdiff/Makefile b/print/latexdiff/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	latexdiff
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	https://github.com/ftilmann/${PORTNAME}/releases/download/${PORTVERSION}/
 
@@ -20,7 +21,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .for m in latexdiff.1 latexdiff-vc.1 latexrevise.1
-	${INSTALL_MAN} ${WRKSRC}/${m} ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${m} ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 	${LN} -s latexdiff-so ${STAGEDIR}${PREFIX}/bin/latexdiff
 

diff --git a/print/latexdiff/pkg-plist b/print/latexdiff/pkg-plist
@@ -3,6 +3,6 @@ bin/latexdiff-fast
 bin/latexdiff-so
 bin/latexdiff-vc
 bin/latexrevise
-man/man1/latexdiff.1.gz
-man/man1/latexdiff-vc.1.gz
-man/man1/latexrevise.1.gz
+share/man/man1/latexdiff.1.gz
+share/man/man1/latexdiff-vc.1.gz
+share/man/man1/latexrevise.1.gz
diff --git a/print/rtf2latex2e/Makefile b/print/rtf2latex2e/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	rtf2latex2e
 DISTVERSION=	2-2-2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-unix/2-2
 
@@ -11,6 +12,6 @@ LICENSE=	GPLv2
 
 USES=		gmake
 MAKE_ARGS=	CC="${CC}" \
-		mandir=${MAN1PREFIX}/man/
+		mandir=${PREFIX}/share/man/
 
 .include <bsd.port.mk>
diff --git a/print/rtf2latex2e/pkg-plist b/print/rtf2latex2e/pkg-plist
@@ -1,5 +1,5 @@
 bin/rtf2latex2e
-man/man1/rtf2latex2e.1.gz
+share/man/man1/rtf2latex2e.1.gz
 %%DATADIR%%/latex-encoding.latin1
 %%DATADIR%%/rtf-encoding.cp1250
 %%DATADIR%%/latex-encoding

diff --git a/science/msms/Makefile b/science/msms/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	msms
 DISTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://mgltools.scripps.edu/downloads/tars/releases/MSMSRELEASE/REL${DISTVERSION}/
 DISTNAME=	${PORTNAME}_${ARCH_MSMS_DIST}Linux2_${DISTVERSION}
@@ -25,13 +26,13 @@ ARCH_MSMS_FILE=	${ARCH:S/amd64/x86_64/:S/i386/i86/}
 DISTINFO_FILE=	${MASTERDIR}/distinfo-${ARCH}
 
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 post-extract:
 	@${AWK} -f ${FILESDIR}/extract-license.awk < ${WRKSRC}/README > ${LICENSE_FILE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.${ARCH_MSMS_FILE}Linux2.${DISTVERSION}${ARCH:S/amd64/.staticgcc/:S/${ARCH}//} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>