diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/Makefile
index 2513448ccfca..be2f10bac197 100644
--- a/sysutils/xxd/Makefile
+++ b/sysutils/xxd/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	xxd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${VIM_DISTVERSION}
 PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	gmarco@giovannelli.it
 COMMENT=	Hexdump and reverse hexdump utility from vim distribution
 WWW=		https://www.vim.org/
 
 LICENSE=	VIM
 LICENSE_NAME=	VIM License
 LICENSE_FILE=	${WRKSRC}/../../runtime/doc/uganda.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vim
 GH_PROJECT=	vim
 
 ALL_TARGET=	${PORTNAME}
 EXTRACT_AFTER_ARGS=	--include='*/src/xxd*' \
 			--include='*/runtime/doc/uganda.txt' \
 			--include='*/runtime/doc/xxd.1'
 PORTSCOUT=	ignore:1
 
 WRKSRC_SUBDIR=	src/xxd
 WRKDOCS=	${WRKSRC}/../../runtime/doc
 
 DISTINFO_FILE=	${VIM_PORT}/distinfo
 PLIST_FILES=	bin/xxd \
 		share/man/man1/xxd.1.gz
 
 .include <bsd.port.pre.mk>
 
 VIM_PORT=		${.CURDIR}/../../editors/vim
 VIM_DISTVERSION!=	${BSDMAKE} -f ${VIM_PORT}/Makefile -V DISTVERSION
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xxd ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDOCS}/xxd.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKDOCS}/xxd.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/textproc/bat/Makefile b/textproc/bat/Makefile
index cd73e7d68097..34969cb013b3 100644
--- a/textproc/bat/Makefile
+++ b/textproc/bat/Makefile
@@ -1,197 +1,197 @@
 PORTNAME=	bat
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.23.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	textproc
 
 MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Clone of cat with syntax highlighting
 WWW=		https://github.com/sharkdp/bat
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libonig.so:devel/oniguruma
 
 USES=		cargo cpe
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	sharkdp
 
 PLIST_FILES=	bin/bat \
 		share/zsh/site-functions/_bat \
-		man/man1/bat.1.gz
+		share/man/man1/bat.1.gz
 
 CARGO_CRATES=	adler-1.0.2 \
 		aho-corasick-0.7.19 \
 		ansi_colours-1.2.1 \
 		assert_cmd-2.0.8 \
 		atty-0.2.14 \
 		autocfg-1.1.0 \
 		base64-0.13.0 \
 		bincode-1.3.3 \
 		bit-set-0.5.3 \
 		bit-vec-0.6.3 \
 		bitflags-1.3.2 \
 		bstr-1.1.0 \
 		bugreport-0.5.0 \
 		bytemuck-1.12.1 \
 		bytesize-1.1.0 \
 		cc-1.0.73 \
 		cfg-if-1.0.0 \
 		clap-4.1.8 \
 		clap_lex-0.3.2 \
 		clircle-0.3.0 \
 		console-0.15.5 \
 		content_inspector-0.2.4 \
 		crc32fast-1.3.2 \
 		difflib-0.4.0 \
 		dirs-5.0.0 \
 		dirs-sys-0.4.0 \
 		dissimilar-1.0.5 \
 		doc-comment-0.3.3 \
 		either-1.8.0 \
 		encode_unicode-0.3.6 \
 		encoding-0.2.33 \
 		encoding-index-japanese-1.20141219.5 \
 		encoding-index-korean-1.20141219.5 \
 		encoding-index-simpchinese-1.20141219.5 \
 		encoding-index-singlebyte-1.20141219.5 \
 		encoding-index-tradchinese-1.20141219.5 \
 		encoding_index_tests-0.1.4 \
 		errno-0.2.8 \
 		errno-dragonfly-0.1.2 \
 		expect-test-1.4.0 \
 		fancy-regex-0.7.1 \
 		fastrand-1.8.0 \
 		flate2-1.0.25 \
 		float-cmp-0.9.0 \
 		fnv-1.0.7 \
 		form_urlencoded-1.1.0 \
 		getrandom-0.2.7 \
 		git-version-0.3.5 \
 		git-version-macro-0.3.5 \
 		git2-0.16.1 \
 		glob-0.3.0 \
 		globset-0.4.10 \
 		grep-cli-0.1.7 \
 		hashbrown-0.12.3 \
 		hermit-abi-0.1.19 \
 		hermit-abi-0.3.1 \
 		idna-0.3.0 \
 		indexmap-1.9.1 \
 		instant-0.1.12 \
 		io-lifetimes-1.0.5 \
 		is-terminal-0.4.4 \
 		itertools-0.10.5 \
 		itoa-1.0.3 \
 		jobserver-0.1.25 \
 		lazy_static-1.4.0 \
 		libc-0.2.137 \
 		libgit2-sys-0.14.2+1.5.1 \
 		libz-sys-1.1.8 \
 		line-wrap-0.1.1 \
 		linked-hash-map-0.5.6 \
 		linux-raw-sys-0.1.4 \
 		lock_api-0.4.9 \
 		log-0.4.17 \
 		memchr-2.5.0 \
 		miniz_oxide-0.6.2 \
 		nix-0.26.2 \
 		normalize-line-endings-0.3.0 \
 		nu-ansi-term-0.47.0 \
 		num-traits-0.2.15 \
 		num_threads-0.1.6 \
 		once_cell-1.17.0 \
 		onig-6.4.0 \
 		onig_sys-69.8.1 \
 		os_str_bytes-6.3.0 \
 		parking_lot-0.11.2 \
 		parking_lot_core-0.8.5 \
 		path_abs-0.5.1 \
 		percent-encoding-2.2.0 \
 		pkg-config-0.3.25 \
 		plist-1.3.1 \
 		predicates-2.1.5 \
 		predicates-core-1.0.3 \
 		predicates-tree-1.0.5 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
 		proc-macro-hack-0.5.19 \
 		proc-macro2-1.0.46 \
 		quote-1.0.21 \
 		redox_syscall-0.2.16 \
 		redox_users-0.4.3 \
 		regex-1.7.0 \
 		regex-automata-0.1.10 \
 		regex-syntax-0.6.27 \
 		remove_dir_all-0.5.3 \
 		rgb-0.8.34 \
 		rustix-0.36.8 \
 		rustversion-1.0.9 \
 		ryu-1.0.11 \
 		safemem-0.3.3 \
 		same-file-1.0.6 \
 		scopeguard-1.1.0 \
 		semver-1.0.16 \
 		serde-1.0.152 \
 		serde_derive-1.0.152 \
 		serde_json-1.0.85 \
 		serde_yaml-0.8.26 \
 		serial_test-0.6.0 \
 		serial_test_derive-0.6.0 \
 		shell-escape-0.1.5 \
 		shell-words-1.1.0 \
 		smallvec-1.10.0 \
 		static_assertions-1.1.0 \
 		std_prelude-0.2.12 \
 		strsim-0.10.0 \
 		syn-1.0.104 \
 		syntect-5.0.0 \
 		sys-info-0.9.1 \
 		tempfile-3.3.0 \
 		termcolor-1.1.3 \
 		terminal_size-0.2.5 \
 		termtree-0.2.4 \
 		thiserror-1.0.38 \
 		thiserror-impl-1.0.38 \
 		time-0.3.14 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.0 \
 		unicode-bidi-0.3.8 \
 		unicode-ident-1.0.4 \
 		unicode-normalization-0.1.22 \
 		unicode-width-0.1.10 \
 		url-2.3.1 \
 		vcpkg-0.2.15 \
 		version_check-0.9.4 \
 		wait-timeout-0.2.0 \
 		walkdir-2.3.2 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		wild-2.1.0 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		windows-sys-0.42.0 \
 		windows-sys-0.45.0 \
 		windows-targets-0.42.1 \
 		windows_aarch64_gnullvm-0.42.1 \
 		windows_aarch64_msvc-0.42.1 \
 		windows_i686_gnu-0.42.1 \
 		windows_i686_msvc-0.42.1 \
 		windows_x86_64_gnu-0.42.1 \
 		windows_x86_64_gnullvm-0.42.1 \
 		windows_x86_64_msvc-0.42.1 \
 		xml-rs-0.8.4 \
 		yaml-rust-0.4.5
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bat
 	${FIND} ${WRKDIR}/target -name "bat.1" -exec ${CP} {} ${WRKSRC}/doc/bat.1 \;
 	${FIND} ${WRKDIR}/target -name "bat.zsh" -exec ${CP} {} ${WRKSRC}/doc/bat.zsh \;
-	${INSTALL_MAN} ${WRKSRC}/doc/bat.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/bat.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/doc/bat.zsh ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_bat
 
 .include <bsd.port.mk>
diff --git a/textproc/bsd-spell/Makefile b/textproc/bsd-spell/Makefile
index 162fba1d8d9b..4268e1be8157 100644
--- a/textproc/bsd-spell/Makefile
+++ b/textproc/bsd-spell/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	bsd-spell
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.0.1
 CATEGORIES=	textproc
 
 MAINTAINER=	gbe@FreeBSD.org
 COMMENT=	This is a port of the 4.4BSD spell command
 WWW=		https://github.com/gbergling/bsdspell
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gbergling
 GH_PROJECT=	bsdspell
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/usr.bin/spell/spellprog ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/usr.bin/deroff/deroff ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/usr.bin/spell/spell.sh ${STAGEDIR}${PREFIX}/bin/bspell
 
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/american ${STAGEDIR}${PREFIX}/share/dict
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/british ${STAGEDIR}${PREFIX}/share/dict
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/special.4bsd ${STAGEDIR}${PREFIX}/share/dict
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/special.math ${STAGEDIR}${PREFIX}/share/dict
 	${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/stop ${STAGEDIR}${PREFIX}/share/dict
 
-	${INSTALL_MAN} ${WRKSRC}/usr.bin/spell/spell.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/usr.bin/deroff/deroff.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/usr.bin/spell/spell.1.gz ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/usr.bin/deroff/deroff.1.gz ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/textproc/bsd-spell/pkg-plist b/textproc/bsd-spell/pkg-plist
index 93d5e4177fcd..76edb9a3d79a 100644
--- a/textproc/bsd-spell/pkg-plist
+++ b/textproc/bsd-spell/pkg-plist
@@ -1,10 +1,10 @@
 libexec/spellprog
 bin/bspell
 bin/deroff
-man/man1/spell.1.gz
-man/man1/deroff.1.gz
+share/man/man1/spell.1.gz
+share/man/man1/deroff.1.gz
 share/dict/american
 share/dict/british
 share/dict/special.4bsd
 share/dict/special.math
 share/dict/stop
diff --git a/textproc/colordiff/Makefile b/textproc/colordiff/Makefile
index 3ea6ea7dbdc5..6381e09cdd88 100644
--- a/textproc/colordiff/Makefile
+++ b/textproc/colordiff/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	colordiff
 PORTVERSION=	1.0.21
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.colordiff.org/ LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Tool to colorize diff output
 WWW=		https://www.colordiff.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		shebangfix perl5
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SHEBANG_FILES=	colordiff.pl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \
 		${WRKSRC}/${PORTNAME}.pl ${WRKSRC}/${PORTNAME}.1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_DATA} ${WRKSRC}/colordiffrc ${STAGEDIR}${PREFIX}/etc/colordiffrc.sample
 
 .include <bsd.port.mk>
diff --git a/textproc/colordiff/pkg-plist b/textproc/colordiff/pkg-plist
index acb993aa94f7..5f87d7fcfd0c 100644
--- a/textproc/colordiff/pkg-plist
+++ b/textproc/colordiff/pkg-plist
@@ -1,3 +1,3 @@
 bin/colordiff
-man/man1/colordiff.1.gz
+share/man/man1/colordiff.1.gz
 @sample etc/colordiffrc.sample
diff --git a/textproc/diffstat/Makefile b/textproc/diffstat/Makefile
index 7cf9e7d459a4..5b3faa36077e 100644
--- a/textproc/diffstat/Makefile
+++ b/textproc/diffstat/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	diffstat
 PORTVERSION=	1.65
+PORTREVISION=	1
 CATEGORIES=	textproc devel
 MASTER_SITES=	https://invisible-mirror.net/archives/${PORTNAME}/ \
 		ftp://ftp.invisible-island.net/${PORTNAME}/
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Makes a histogram summarizing "diff" output
 WWW=		https://invisible-island.net/diffstat/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		tar:tgz
 GNU_CONFIGURE=	yes
 MAKEFILE=	makefile
 
-PLIST_FILES=	bin/diffstat man/man1/diffstat.1.gz
+PLIST_FILES=	bin/diffstat share/man/man1/diffstat.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/textproc/fldiff/Makefile b/textproc/fldiff/Makefile
index 22cca6ff6e05..6bdaae9110fb 100644
--- a/textproc/fldiff/Makefile
+++ b/textproc/fldiff/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	fldiff
 PORTVERSION=	1.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/ehaupt
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Graphical diff program using FLTK
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 USES=		jpeg xorg
 USE_XORG=	x11 xext xfixes xft
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	index.html fldiff.jpg
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@OPTIM@||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/CXX="$$CC"/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|=Development|=Application;Development;|' \
 		${WRKSRC}/fldiff.desktop
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fldiff ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/fldiff.man ${STAGEDIR}${MAN1PREFIX}/man/man1/fldiff.1
+	${INSTALL_MAN} ${WRKSRC}/fldiff.man ${STAGEDIR}${PREFIX}/share/man/man1/fldiff.1
 	${INSTALL_DATA} ${WRKSRC}/fldiff.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/fldiff.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/fldiff/pkg-plist b/textproc/fldiff/pkg-plist
index bf337c5e2a48..d80ea8cc9f31 100644
--- a/textproc/fldiff/pkg-plist
+++ b/textproc/fldiff/pkg-plist
@@ -1,4 +1,4 @@
 bin/fldiff
-man/man1/fldiff.1.gz
+share/man/man1/fldiff.1.gz
 share/applications/fldiff.desktop
 share/pixmaps/fldiff.png
diff --git a/textproc/grap/Makefile b/textproc/grap/Makefile
index 6b526221abe0..0682f44e6373 100644
--- a/textproc/grap/Makefile
+++ b/textproc/grap/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	grap
 PORTVERSION=	1.46
+PORTREVISION=	1
 CATEGORIES=	textproc graphics
 MASTER_SITES=	http://www.lunabase.org/~faber/Vault/software/grap/
 
 MAINTAINER=	faber@lunabase.org
 COMMENT=	Implementation of Kernigan & Bentley's grap language
 WWW=		https://www.lunabase.org/~faber/Vault/software/grap/
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=--with-freebsd-ports
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 CONFLICTS_INSTALL=heirloom-doctools
 
 PORTDOCS=	README CHANGES COPYRIGHT grap.man
 PORTEXAMPLES=	*
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.doc \
-		${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
+		${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/grap.defines ${WRKSRC}/grap.tex.defines \
 		${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/textproc/grap/pkg-plist b/textproc/grap/pkg-plist
index b21f11fde08c..febeda0adb9e 100644
--- a/textproc/grap/pkg-plist
+++ b/textproc/grap/pkg-plist
@@ -1,4 +1,4 @@
 bin/grap
-man/man1/grap.1.gz
+share/man/man1/grap.1.gz
 %%DATADIR%%/grap.defines
 %%DATADIR%%/grap.tex.defines
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 3069334268ba..fd1ff8239ddb 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -1,271 +1,271 @@
 PORTNAME=	pandoc
 PORTVERSION=	3.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Conversion between markup formats
 WWW=		https://pandoc.org
 
 LICENSE=	GPLv2
 
 USES=		cabal
 
 OPTIONS_DEFINE=		EMBED_DATA
 
 EMBED_DATA_DESC=	Embed data files in binary for relocatable executable
 EMBED_DATA_CABAL_FLAGS=	embed_data_files
 
 USE_CABAL=	Glob-0.10.2_3 \
 		HUnit-1.6.2.0 \
 		JuicyPixels-3.3.8 \
 		OneTuple-0.4.1.1 \
 		Only-0.1_2 \
 		QuickCheck-2.14.3 \
 		SHA-1.6.4.4 \
 		StateVar-1.2.2 \
 		aeson-2.1.2.1_3 \
 		aeson-pretty-0.8.10 \
 		alex-3.4.0.0 \
 		ansi-terminal-1.0 \
 		ansi-terminal-types-0.11.5_1 \
 		appar-0.1.8 \
 		asn1-encoding-0.9.6_2 \
 		asn1-parse-0.9.5 \
 		asn1-types-0.3.4 \
 		assoc-1.1 \
 		async-2.2.4_3 \
 		attoparsec-0.14.4_4 \
 		attoparsec-aeson-2.1.0.0 \
 		auto-update-0.1.6 \
 		base-compat-0.13.0 \
 		base-compat-batteries-0.13.0 \
 		base-orphans-0.9.0 \
 		base-unicode-symbols-0.2.4.2 \
 		base16-bytestring-1.0.2.0 \
 		base64-0.4.2.4_3 \
 		base64-bytestring-1.2.1.0_1 \
 		basement-0.0.16 \
 		bifunctors-5.6.1_1 \
 		bitvec-1.1.5.0 \
 		blaze-builder-0.4.2.3 \
 		blaze-html-0.9.1.2_4 \
 		blaze-markup-0.8.2.8_5 \
 		boring-0.2.1 \
 		bsb-http-chunked-0.0.0.4_3 \
 		byteorder-1.0.4 \
 		cabal-doctest-1.0.9_3 \
 		call-stack-0.4.0 \
 		case-insensitive-1.2.1.0 \
 		cassava-0.5.3.0_4 \
 		cereal-0.5.8.3 \
 		citeproc-0.8.1 \
 		cmdargs-0.10.22 \
 		colour-2.3.6 \
 		commonmark-0.2.3 \
 		commonmark-extensions-0.2.3.6 \
 		commonmark-pandoc-0.2.1.3 \
 		comonad-5.0.8_1 \
 		conduit-1.3.5 \
 		conduit-extra-1.3.6 \
 		constraints-0.13.4_1 \
 		contravariant-1.5.5 \
 		cookie-0.4.6 \
 		crypton-0.33 \
 		crypton-connection-0.3.1 \
 		crypton-x509-1.7.6_1 \
 		crypton-x509-store-1.6.9 \
 		crypton-x509-system-1.6.7 \
 		crypton-x509-validation-1.6.12 \
 		data-default-0.7.1.1 \
 		data-default-class-0.1.2.0 \
 		data-default-instances-containers-0.0.1 \
 		data-default-instances-dlist-0.0.1 \
 		data-default-instances-old-locale-0.0.1 \
 		data-fix-0.3.2_4 \
 		dec-0.0.5_1 \
 		digest-0.0.1.7_1 \
 		digits-0.3.1 \
 		distributive-0.6.2.1_1 \
 		dlist-1.0_1 \
 		doclayout-0.4.0.1 \
 		doctemplates-0.11 \
 		easy-file-0.2.5 \
 		emojis-0.1.3 \
 		fast-logger-3.2.2 \
 		file-embed-0.0.15.0 \
 		foldable1-classes-compat-0.1_3 \
 		generically-0.1.1_1 \
 		gridtables-0.1.0.0 \
 		haddock-library-1.11.0_2 \
 		happy-1.20.1.1 \
 		hashable-1.4.3.0 \
 		haskell-lexer-1.1.1 \
 		hourglass-0.2.12 \
 		hsc2hs-0.68.9 \
 		hslua-2.3.0 \
 		hslua-aeson-2.3.0.1 \
 		hslua-classes-2.3.0 \
 		hslua-cli-1.4.1 \
 		hslua-core-2.3.1 \
 		hslua-list-1.1.1 \
 		hslua-marshalling-2.3.0 \
 		hslua-module-doclayout-1.1.0 \
 		hslua-module-path-1.1.0 \
 		hslua-module-system-1.1.0.1 \
 		hslua-module-text-1.1.0.1 \
 		hslua-module-version-1.1.0 \
 		hslua-module-zip-1.1.0 \
 		hslua-objectorientation-2.3.0 \
 		hslua-packaging-2.3.0 \
 		hslua-repl-0.1.1 \
 		hslua-typing-0.1.0 \
 		http-api-data-0.6 \
 		http-client-0.7.14 \
 		http-client-tls-0.3.6.3 \
 		http-date-0.0.11 \
 		http-media-0.8.1.1 \
 		http-types-0.12.3 \
 		http2-4.1.4 \
 		indexed-traversable-0.1.2.1 \
 		indexed-traversable-instances-0.1.1.2_1 \
 		integer-conversion-0.1 \
 		integer-logarithms-1.0.3.1_4 \
 		iproute-1.7.12 \
 		ipynb-0.2_1 \
 		isocline-1.0.9 \
 		jira-wiki-markup-1.5.1 \
 		libyaml-0.1.2_1 \
 		lpeg-1.0.4 \
 		lua-2.3.1 \
 		memory-0.18.0 \
 		mime-types-0.1.1.0 \
 		mmorph-1.2.0_3 \
 		monad-control-1.0.3.1 \
 		mono-traversable-1.0.15.3 \
 		network-3.1.4.0_1 \
 		network-byte-order-0.1.6_1 \
 		network-uri-2.6.4.2 \
 		old-locale-1.0.0.7_2 \
 		old-time-1.1.0.3_2 \
 		optparse-applicative-0.18.1.0 \
 		ordered-containers-0.2.3 \
 		pandoc-3.1.8 \
 		pandoc-lua-engine-0.2.1.2_1 \
 		pandoc-lua-marshal-0.2.2 \
 		pandoc-server-0.1.0.3 \
 		pandoc-types-1.23.1 \
 		pem-0.2.4 \
 		pretty-show-1.10 \
 		prettyprinter-1.7.1 \
 		prettyprinter-ansi-terminal-1.1.3 \
 		primitive-0.8.0.0_1 \
 		psqueues-0.2.7.3 \
 		random-1.2.1.1 \
 		recv-0.1.0 \
 		regex-base-0.94.0.2_2 \
 		regex-tdfa-1.3.2.2_1 \
 		resourcet-1.3.0 \
 		safe-0.3.19 \
 		safe-exceptions-0.1.7.4 \
 		scientific-0.3.7.0_5 \
 		semialign-1.3 \
 		semigroupoids-6.0.0.1 \
 		servant-0.20_3 \
 		servant-server-0.20_2 \
 		simple-sendfile-0.2.32 \
 		singleton-bool-0.1.7 \
 		skylighting-0.14 \
 		skylighting-core-0.14 \
 		skylighting-format-ansi-0.1 \
 		skylighting-format-blaze-html-0.1.1.1 \
 		skylighting-format-context-0.1.0.2 \
 		skylighting-format-latex-0.1 \
 		socks-0.6.1 \
 		some-1.0.5 \
 		sop-core-0.5.0.2_2 \
 		split-0.2.3.5 \
 		splitmix-0.1.0.4_2 \
 		streaming-commons-0.2.2.6 \
 		strict-0.5 \
 		string-conversions-0.4.0.1_1 \
 		syb-0.7.2.4 \
 		tagged-0.8.8 \
 		tagsoup-0.14.8 \
 		temporary-1.3 \
 		texmath-0.12.8.3 \
 		text-conversions-0.3.1.1 \
 		text-iso8601-0.1 \
 		text-short-0.1.5_2 \
 		th-abstraction-0.5.0.0 \
 		th-compat-0.1.4_3 \
 		th-lift-0.8.4 \
 		th-lift-instances-0.1.20 \
 		these-1.2 \
 		time-compat-1.9.6.1_5 \
 		time-manager-0.0.1 \
 		tls-1.9.0 \
 		toml-parser-1.3.0.0 \
 		transformers-base-0.4.6 \
 		transformers-compat-0.7.2 \
 		type-equality-1_5 \
 		typed-process-0.2.11.0 \
 		typst-0.3.2.0 \
 		typst-symbols-0.1.4 \
 		unicode-collation-0.1.3.5 \
 		unicode-data-0.4.0.1_1 \
 		unicode-transforms-0.4.0.1_3 \
 		uniplate-1.6.13_1 \
 		unix-compat-0.7 \
 		unix-time-0.4.11 \
 		unliftio-0.2.25.0 \
 		unliftio-core-0.2.1.0_2 \
 		unordered-containers-0.2.19.1_2 \
 		utf8-string-1.0.2 \
 		uuid-types-1.0.5_4 \
 		vault-0.3.1.5_3 \
 		vector-0.13.0.0_5 \
 		vector-algorithms-0.9.0.1_2 \
 		vector-stream-0.1.0.0_3 \
 		wai-3.2.3 \
 		wai-app-static-3.1.8 \
 		wai-cors-0.2.7 \
 		wai-extra-3.1.13.0_1 \
 		wai-logger-2.4.0 \
 		warp-3.3.29 \
 		witherable-0.4.2_4 \
 		word8-0.1.3 \
 		xml-1.3.14_2 \
 		xml-conduit-1.9.1.3 \
 		xml-types-0.3.8 \
 		yaml-0.11.11.2_2 \
 		zip-archive-0.4.3 \
 		zlib-0.6.3.0_3
 
 CABAL_FLAGS=	lua
 
 HACKAGE_DISTNAME=	pandoc-cli-0.1.1.1
 CABAL_WRAPPER_SCRIPTS=	${CABAL_EXECUTABLES}
 
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEMBED_DATA}
 # No need to use wrapper scripts when all data is compiled into an executable
 .undef CABAL_WRAPPER_SCRIPTS
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
 # compiler goes out of memory
 BUILD_ARGS+=	--disable-optimization
 .endif
 
 post-install-EMBED_DATA-off:
 	cd ${CABAL_DEPSDIR}/${PORTNAME}-${PORTVERSION} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}
 post-install:
-	${INSTALL_MAN} ${CABAL_DEPSDIR}/${PORTNAME}-${PORTVERSION}/man/pandoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${CABAL_DEPSDIR}/${PORTNAME}-${PORTVERSION}/man/pandoc.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/textproc/hs-pandoc/pkg-plist b/textproc/hs-pandoc/pkg-plist
index 1c47a5014406..84d25ed43d0e 100644
--- a/textproc/hs-pandoc/pkg-plist
+++ b/textproc/hs-pandoc/pkg-plist
@@ -1,178 +1,178 @@
-man/man1/pandoc.1.gz
+share/man/man1/pandoc.1.gz
 %%NO_EMBED_DATA%%%%DATADIR%%/data/abbreviations
 %%NO_EMBED_DATA%%%%DATADIR%%/data/bash_completion.tpl
 %%NO_EMBED_DATA%%%%DATADIR%%/data/creole.lua
 %%NO_EMBED_DATA%%%%DATADIR%%/data/default.csl
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docbook-entities.txt
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/[Content_Types].xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/_rels/.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/docProps/app.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/docProps/core.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/docProps/custom.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/word/_rels/document.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/word/_rels/footnotes.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/word/comments.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/word/document.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/word/fontTable.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/word/footnotes.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/word/numbering.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/word/settings.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/word/styles.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/word/theme/theme1.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/docx/word/webSettings.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/dzslides/template.html
 %%NO_EMBED_DATA%%%%DATADIR%%/data/epub.css
 %%NO_EMBED_DATA%%%%DATADIR%%/data/init.lua
 %%NO_EMBED_DATA%%%%DATADIR%%/data/odt/META-INF/manifest.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/odt/content.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/odt/manifest.rdf
 %%NO_EMBED_DATA%%%%DATADIR%%/data/odt/meta.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/odt/mimetype
 %%NO_EMBED_DATA%%%%DATADIR%%/data/odt/styles.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/[Content_Types].xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/_rels/.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/docProps/app.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/docProps/core.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/_rels/presentation.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/notesMasters/_rels/notesMaster1.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/notesMasters/notesMaster1.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/notesSlides/_rels/notesSlide2.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/notesSlides/notesSlide1.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/notesSlides/notesSlide2.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/presProps.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/presentation.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout1.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout10.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout11.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout2.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout3.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout4.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout5.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout6.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout7.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout8.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/_rels/slideLayout9.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout1.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout10.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout11.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout2.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout3.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout4.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout5.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout6.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout7.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout8.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideLayouts/slideLayout9.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideMasters/_rels/slideMaster1.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slideMasters/slideMaster1.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slides/_rels/slide1.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slides/_rels/slide2.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slides/_rels/slide3.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slides/_rels/slide4.xml.rels
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slides/slide1.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slides/slide2.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slides/slide3.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/slides/slide4.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/tableStyles.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/theme/theme1.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/theme/theme2.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/pptx/ppt/viewProps.xml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/affiliations.jats
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/article.jats_publishing
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.asciidoc
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.biblatex
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.bibtex
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.chunkedhtml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.commonmark
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.context
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.docbook4
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.docbook5
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.dokuwiki
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.dzslides
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.epub2
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.epub3
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.haddock
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.html4
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.html5
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.icml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.jats_archiving
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.jats_articleauthoring
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.jats_publishing
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.jira
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.latex
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.man
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.markdown
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.markua
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.mediawiki
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.ms
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.muse
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.opendocument
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.opml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.org
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.plain
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.revealjs
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.rst
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.rtf
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.s5
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.slideous
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.slidy
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.tei
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.texinfo
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.textile
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.typst
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.xwiki
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/default.zimwiki
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/definitions.typst
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/styles.citations.html
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/styles.html
 %%NO_EMBED_DATA%%%%DATADIR%%/data/templates/template.typst
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/am.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/ar.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/bg.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/bn.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/ca.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/cs.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/da.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/de.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/el.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/en.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/eo.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/es.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/et.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/eu.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/fa.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/fi.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/fr.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/he.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/hi.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/hr.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/hu.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/is.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/it.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/km.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/ko.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/lo.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/lt.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/lv.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/nl.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/nn.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/no.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/pl.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/pt.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/rm.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/ro.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/ru.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/sk.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/sl.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/sq.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/sr-cyrl.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/sr.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/sv.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/th.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/tr.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/uk.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/ur.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/vi.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/zh-Hans.yaml
 %%NO_EMBED_DATA%%%%DATADIR%%/data/translations/zh-Hant.yaml
diff --git a/textproc/igor/Makefile b/textproc/igor/Makefile
index ca2655b0d324..c2b64964ada9 100644
--- a/textproc/igor/Makefile
+++ b/textproc/igor/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	igor
 PORTVERSION=	1.595
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://docscripts.glenbarber.us/tags/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	wblock@FreeBSD.org
 COMMENT=	FreeBSD Documentation Project sanity check script
 WWW=		http://www.wonkity.com/~wblock/igor/
 
 LICENSE=	BSD2CLAUSE
 
 USES=		perl5
 USE_PERL5=	run
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1
 
 do-install:
 	${INSTALL_SCRIPT} ${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/textproc/libsoldout/Makefile b/textproc/libsoldout/Makefile
index ce33e3d342a3..5f41590a6065 100644
--- a/textproc/libsoldout/Makefile
+++ b/textproc/libsoldout/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	libsoldout
 DISTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://instinctive.eu/code/
 
 MAINTAINER=	natbsd@instinctive.eu
 COMMENT=	Flexible C library for markdown
 WWW=		http://fossil.instinctive.eu/libsoldout/index
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 MAKEFILE=	BSDmakefile
 USE_LDCONFIG=	yes
 USES=	tar:bzip2
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/libsoldout.so.1 ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/mkd2html ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mkd2latex ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mkd2man ${STAGEDIR}${PREFIX}/bin
 	cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s libsoldout.so.1 libsoldout.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/soldout
 	${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/soldout
 	${INSTALL_DATA} ${WRKSRC}/libsoldout.a ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/mkd2*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/mkd2*.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/*.3 ${STAGEDIR}${PREFIX}/share/man/man3
 
 .include <bsd.port.mk>
diff --git a/textproc/libsoldout/pkg-plist b/textproc/libsoldout/pkg-plist
index 040c31ac04e5..5609dc0d6fe4 100644
--- a/textproc/libsoldout/pkg-plist
+++ b/textproc/libsoldout/pkg-plist
@@ -1,18 +1,18 @@
 bin/mkd2latex
 bin/mkd2html
 bin/mkd2man
 include/soldout/array.h
 include/soldout/buffer.h
 include/soldout/markdown.h
 include/soldout/renderers.h
 lib/libsoldout.a
 lib/libsoldout.so
 lib/libsoldout.so.1
-man/man1/mkd2html.1.gz
-man/man1/mkd2latex.1.gz
-man/man1/mkd2man.1.gz
-man/man3/soldout.3.gz
-man/man3/soldout_array.3.gz
-man/man3/soldout_buffer.3.gz
-man/man3/soldout_markdown.3.gz
-man/man3/soldout_renderers.3.gz
+share/man/man1/mkd2html.1.gz
+share/man/man1/mkd2latex.1.gz
+share/man/man1/mkd2man.1.gz
+share/man/man3/soldout.3.gz
+share/man/man3/soldout_array.3.gz
+share/man/man3/soldout_buffer.3.gz
+share/man/man3/soldout_markdown.3.gz
+share/man/man3/soldout_renderers.3.gz
diff --git a/textproc/re-flex/Makefile b/textproc/re-flex/Makefile
index df4870253f5e..55166e342e79 100644
--- a/textproc/re-flex/Makefile
+++ b/textproc/re-flex/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	re-flex
 PORTVERSION=	3.5.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Regex-centric, fast and flexible scanner generator for C++
 WWW=		https://www.genivia.com/reflex.html
 
 LICENSE=	BSD3CLAUSE
 
 USES=		compiler:c++11-lib cmake
 
 OPTIONS_DEFINE=	SIMD
 SIMD_CMAKE_OFF=	-DUSE_AVX512BW:BOOL=OFF -DUSE_AVX2:BOOL=OFF \
 		-DUSE_SSE2:BOOL=OFF -DUSE_NEON:BOOL=OFF
 
 CONFLICTS_INSTALL=	reflex
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Genivia
 GH_PROJECT=	RE-flex
 
 post-patch:
 	${REINPLACE_CMD} \
 		's|reflex_static_lib|reflex|; s|reflex_shared_lib|reflex|' \
 		${WRKSRC}/CMakeLists.txt
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/reflex
 	(cd ${WRKSRC}/include/reflex && \
 	 ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/include/reflex)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/lex.vim ${STAGEDIR}${DATADIR}/lex.vim
-	${INSTALL_MAN} ${WRKSRC}/doc/man/reflex.1 ${STAGEDIR}/${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/man/reflex.1 ${STAGEDIR}/${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/textproc/re-flex/pkg-plist b/textproc/re-flex/pkg-plist
index b1906428cf89..2cbca4ae5141 100644
--- a/textproc/re-flex/pkg-plist
+++ b/textproc/re-flex/pkg-plist
@@ -1,30 +1,30 @@
 bin/reflex
 include/reflex/abslexer.h
 include/reflex/absmatcher.h
 include/reflex/bits.h
 include/reflex/boostmatcher.h
 include/reflex/convert.h
 include/reflex/debug.h
 include/reflex/error.h
 include/reflex/flexlexer.h
 include/reflex/input.h
 include/reflex/linematcher.h
 include/reflex/matcher.h
 include/reflex/pcre2matcher.h
 include/reflex/pattern.h
 include/reflex/posix.h
 include/reflex/ranges.h
 include/reflex/setop.h
 include/reflex/simd.h
 include/reflex/stdmatcher.h
 include/reflex/timer.h
 include/reflex/traits.h
 include/reflex/unicode.h
 include/reflex/utf8.h
 lib/libreflex.a
 lib/libreflex.so
 lib/cmake/reflex/ReflexConfig.cmake
 lib/cmake/reflex/ReflexTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/reflex/ReflexTargets.cmake
 %%DATADIR%%/lex.vim
-man/man1/reflex.1.gz
+share/man/man1/reflex.1.gz
diff --git a/textproc/reflex/pkg-plist b/textproc/reflex/pkg-plist
index 459f98336530..931a8a392ab9 100644
--- a/textproc/reflex/pkg-plist
+++ b/textproc/reflex/pkg-plist
@@ -1,6 +1,6 @@
 bin/reflex
 bin/reflex++
 include/reFlexLexer.h
 lib/librefl.a
-man/man1/reflex++.1.gz
-man/man1/reflex.1.gz
+share/man/man1/reflex++.1.gz
+share/man/man1/reflex.1.gz
diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile
index 502b5a01dc08..d04c7dfcf912 100644
--- a/textproc/ripgrep/Makefile
+++ b/textproc/ripgrep/Makefile
@@ -1,108 +1,108 @@
 PORTNAME=	ripgrep
 DISTVERSION=	14.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 
 MAINTAINER=	petteri.valkonen@iki.fi
 COMMENT=	Command line search tool
 WWW=		https://blog.burntsushi.net/ripgrep/
 
 LICENSE=	MIT UNLICENSE
 LICENSE_COMB=	dual
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 LICENSE_FILE_UNLICENSE=	${WRKSRC}/UNLICENSE
 
 USES=		cargo cpe
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	BurntSushi
 
 CARGO_CRATES=	aho-corasick-1.1.2 \
 		anyhow-1.0.75 \
 		autocfg-1.1.0 \
 		bstr-1.8.0 \
 		cc-1.0.83 \
 		cfg-if-1.0.0 \
 		crossbeam-channel-0.5.8 \
 		crossbeam-deque-0.8.3 \
 		crossbeam-epoch-0.9.15 \
 		crossbeam-utils-0.8.16 \
 		encoding_rs-0.8.33 \
 		encoding_rs_io-0.1.7 \
 		glob-0.3.1 \
 		itoa-1.0.9 \
 		jemalloc-sys-0.5.4+5.3.0-patched \
 		jemallocator-0.5.4 \
 		jobserver-0.1.27 \
 		lexopt-0.3.0 \
 		libc-0.2.150 \
 		libm-0.2.8 \
 		log-0.4.20 \
 		memchr-2.6.4 \
 		memmap2-0.9.0 \
 		memoffset-0.9.0 \
 		num-traits-0.2.17 \
 		packed_simd-0.3.9 \
 		pcre2-0.2.6 \
 		pcre2-sys-0.2.7 \
 		pkg-config-0.3.27 \
 		proc-macro2-1.0.70 \
 		quote-1.0.33 \
 		regex-1.10.2 \
 		regex-automata-0.4.3 \
 		regex-syntax-0.8.2 \
 		ryu-1.0.15 \
 		same-file-1.0.6 \
 		scopeguard-1.2.0 \
 		serde-1.0.193 \
 		serde_derive-1.0.193 \
 		serde_json-1.0.108 \
 		syn-2.0.39 \
 		termcolor-1.4.0 \
 		textwrap-0.16.0 \
 		unicode-ident-1.0.12 \
 		walkdir-2.4.0 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.6 \
 		winapi-x86_64-pc-windows-gnu-0.4.0
 
 PLIST_FILES=	bin/rg \
 		etc/bash_completion.d/rg.bash \
-		man/man1/rg.1.gz \
+		share/man/man1/rg.1.gz \
 		share/fish/vendor_completions.d/rg.fish \
 		share/zsh/site-functions/_rg
 
 PORTDOCS=	CHANGELOG.md FAQ.md GUIDE.md
 
 OPTIONS_DEFINE=	DOCS PCRE2 SIMD
 OPTIONS_DEFAULT=PCRE2
 
 OPTIONS_DEFAULT_aarch64=SIMD
 OPTIONS_DEFAULT_amd64=	${OPTIONS_DEFAULT_i386}
 OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:S/SSE2/SIMD/}
 
 PCRE2_DESC=	${PCRE_DESC} version 2
 PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PCRE2_VARS=	CARGO_FEATURES+=pcre2
 
 SIMD_MAKE_ENV=	RUSTC_BOOTSTRAP=encoding_rs,packed_simd
 SIMD_VARS=	CARGO_FEATURES+=simd-accel ${SIMD_VARS_${ARCH}}
 SIMD_VARS_i386=	RUSTFLAGS+="-C target-feature=+sse2"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rg
 	${STAGEDIR}${PREFIX}/bin/rg --generate man > ${WRKDIR}/rg.1
-	${INSTALL_MAN} ${WRKDIR}/rg.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/rg.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 	${STAGEDIR}${PREFIX}/bin/rg --generate complete-bash > ${STAGEDIR}${PREFIX}/etc/bash_completion.d/rg.bash
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/
 	${STAGEDIR}${PREFIX}/bin/rg --generate complete-fish > ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/rg.fish
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${STAGEDIR}${PREFIX}/bin/rg --generate complete-zsh > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_rg
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/sansi/Makefile b/textproc/sansi/Makefile
index 7034a9934f95..0edb392046a1 100644
--- a/textproc/sansi/Makefile
+++ b/textproc/sansi/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	sansi
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	textproc sysutils
 MASTER_SITES=	https://BSDforge.com/projects/source/textproc/sansi/
 
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Removes ANSI control sequences/characters, from files
 WWW=		https://BSDforge.com/projects/textproc/sansi/
 
 LICENSE=	ART20 BSD2CLAUSE
 LICENSE_COMB=	multi
 
 BROKEN=		Unfetchable
 
 RUN_DEPENDS=	p5-PerlIO-eol>=0:devel/p5-PerlIO-eol \
 		p5-Modern-Perl>=0:lang/p5-Modern-Perl
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 USES=		tar:xz
 
-PLIST_FILES=	sbin/sansi man/man1/sansi.1.gz
+PLIST_FILES=	sbin/sansi share/man/man1/sansi.1.gz
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sansi ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/sansi.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/sansi.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/textproc/uni2ascii/Makefile b/textproc/uni2ascii/Makefile
index 08e8315834ce..1a3b2e8bdc06 100644
--- a/textproc/uni2ascii/Makefile
+++ b/textproc/uni2ascii/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	uni2ascii
 PORTVERSION=	4.18
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/ \
 		LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Convert between UTF-8 Unicode and 7-bit ASCII equivalents
 WWW=		http://freecode.com/projects/uni2ascii/
 
 LICENSE=	GPLv3
 
 USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
-PLIST_FILES=	bin/uni2ascii bin/ascii2uni man/man1/uni2ascii.1.gz \
-		man/man1/ascii2uni.1.gz
+PLIST_FILES=	bin/uni2ascii bin/ascii2uni share/man/man1/uni2ascii.1.gz \
+		share/man/man1/ascii2uni.1.gz
 
 do-install:
 .for f in ${PORTNAME} ascii2uni
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index c81839721a2c..d0cc289f49ef 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	urlview
 PORTVERSION=	0.9.20131021
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc www
 
 MAINTAINER=	uzsolt@uzsolt.hu
 COMMENT=	URL extractor/launcher
 WWW=		https://github.com/sigpipe/urlview
 
 LICENSE=	GPLv2
 
 USES=		ncurses
 USE_GITHUB=	yes
 GH_ACCOUNT=	sigpipe
 GH_TAGNAME=	45443109
 
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/urlview \
 		etc/urlview.conf.sample \
-		man/man1/urlview.1.gz
+		share/man/man1/urlview.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		-e 's/DEFAULT_COMMAND.*url_handler.sh/DEFAULT_COMMAND "firefox/' \
 		${WRKSRC}/*
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/urlview ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/urlview.man ${STAGEDIR}${MAN1PREFIX}/man/man1/urlview.1
+	${INSTALL_MAN} ${WRKSRC}/urlview.man ${STAGEDIR}${PREFIX}/share/man/man1/urlview.1
 	${INSTALL_DATA} ${WRKSRC}/sample.urlview \
 		${STAGEDIR}${PREFIX}/etc/urlview.conf.sample
 
 .include <bsd.port.mk>
diff --git a/www/angie/Makefile b/www/angie/Makefile
index f7c831f9fcb5..1f45373a10df 100644
--- a/www/angie/Makefile
+++ b/www/angie/Makefile
@@ -1,187 +1,188 @@
 PORTNAME?=		angie
 PORTVERSION=		1.3.1
+PORTREVISION=		1
 CATEGORIES+=		www
 MASTER_SITES+=		https://download.angie.software/files/:angie
 DISTNAME=		angie-${DISTVERSIONFULL}
 DISTFILES+=		${DISTNAME}${EXTRACT_SUFX}:angie
 
 MAINTAINER?=		oleg@mamontov.net
 COMMENT?=		Efficient, powerful and scalable reverse proxy and web server
 WWW?=			https://angie.software/en/
 
 LICENSE?=		BSD2CLAUSE
 .if ${PORTNAME} == angie
 LICENSE_FILE=		${WRKSRC}/LICENSE
 .else
 LICENSE_FILE?=		${WRKSRC_module}/LICENSE
 .endif
 
 .if ${PORTNAME} == angie
 LIB_DEPENDS=		libpcre2-8.so:devel/pcre2
 .else
 BUILD_DEPENDS+=		pcre2>=0:devel/pcre2
 RUN_DEPENDS+=		angie==${PKGVERSION}:www/angie
 .endif
 
 USES+=			localbase:ldflags ssl
 USE_GITHUB=		nodefault
 
 HAS_CONFIGURE?=		yes
 
 .if ${PORTNAME} == angie
 ALL_TARGET=		build
 SUB_FILES=		angie.conf.sample \
 			default.conf.sample \
 			example.conf.sample \
 			pkg-message
 USE_RC_SUBR=		angie
 .else
 ALL_TARGET?=		modules
 CONFIGURE_ADD?=		--add-dynamic-module=${WRKSRC_module}
 .endif
 
 # modules always have their own assets
 PATCHDIR?=		${.CURDIR}/files
 FILESDIR?=		${.CURDIR}/files
 SCRIPTDIR?=		${.CURDIR}/scripts
 PKGDIR?=		${.CURDIR}
 
 # angie-specific variables
 CACHEDIR=		/var/cache/angie
 LOGDIR=			/var/log/angie
 MODDIR=			${PREFIX}/libexec/angie
 RUNDIR=			/var/run
 WRKSRC_DEBUG=		${WRKSRC}-debug
 
 PLIST_SUB+=		CACHEDIR=${CACHEDIR} \
 			LOGDIR=${LOGDIR} \
 			MODDIR=${MODDIR} \
 			RUNDIR=${RUNDIR}
 
 SUB_LIST+=		CACHEDIR=${CACHEDIR} \
 			LOGDIR=${LOGDIR} \
 			MODDIR=${MODDIR} \
 			RUNDIR=${RUNDIR} \
 			WWWOWN=${WWWOWN}
 
 SUB_FILES?=		pkg-message
 
 OPTIONS_SUB=		yes
 
 CONFIGURE_ARGS=		--prefix=${PREFIX}/etc/angie \
 			--conf-path=${PREFIX}/etc/angie/angie.conf \
 			--error-log-path=${LOGDIR}/error.log \
 			--http-log-path=${LOGDIR}/access.log \
 			--lock-path=${RUNDIR}/angie.lock \
 			--modules-path=${MODDIR} \
 			--pid-path=${RUNDIR}/angie.pid \
 			--sbin-path=${PREFIX}/sbin/angie \
 			--http-client-body-temp-path=${CACHEDIR}/client_temp \
 			--http-fastcgi-temp-path=${CACHEDIR}/fastcgi_temp \
 			--http-proxy-temp-path=${CACHEDIR}/proxy_temp \
 			--http-scgi-temp-path=${CACHEDIR}/scgi_temp \
 			--http-uwsgi-temp-path=${CACHEDIR}/uwsgi_temp \
 			--user=${WWWOWN} \
 			--group=${WWWGRP} \
 			--with-file-aio \
 			--with-http_addition_module \
 			--with-http_auth_request_module \
 			--with-http_dav_module \
 			--with-http_flv_module \
 			--with-http_gunzip_module \
 			--with-http_gzip_static_module \
 			--with-http_mp4_module \
 			--with-http_random_index_module \
 			--with-http_realip_module \
 			--with-http_secure_link_module \
 			--with-http_slice_module \
 			--with-http_ssl_module \
 			--with-http_stub_status_module \
 			--with-http_sub_module \
 			--with-http_v2_module \
 			--with-http_v3_module \
 			--with-mail \
 			--with-mail_ssl_module \
 			--with-stream \
 			--with-stream_realip_module \
 			--with-stream_ssl_module \
 			--with-stream_ssl_preread_module \
 			--with-threads \
 			--with-cc-opt="${CFLAGS}" \
 			--with-ld-opt="${LDFLAGS}" \
 			${CONFIGURE_ADD}
 
 OPTIONS_DEFINE?=	DEBUG
 OPTIONS_DEFAULT?=	DEBUG
 DEBUG_DESC?=		Include debug version
 
 .include <bsd.port.options.mk>
 
 post-patch-DEBUG-on:
 	@${CP} -Rp ${WRKSRC} ${WRKSRC_DEBUG}
 
 post-configure-DEBUG-on:
 	@(cd ${WRKSRC_DEBUG} && \
 	    ${SET_LATE_CONFIGURE_ARGS} \
 	    if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 	        CFLAGS="${CFLAGS} -g" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 	        LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
 	        INSTALL="/usr/bin/install -c" \
 	        INSTALL_DATA="${INSTALL_DATA}" \
 	        INSTALL_LIB="${INSTALL_LIB}" \
 	        INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 	        INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 	        ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} --with-debug; then \
 	        ${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
 	        (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT_80} ; \
 	        ${FALSE}; \
 	    fi \
 	)
 
 post-build-DEBUG-on:
 	@(cd ${WRKSRC_DEBUG} && ${DO_MAKE_BUILD} ${ALL_TARGET})
 
 .if ${PORTNAME} == angie
 do-install:
 	${MKDIR} ${STAGEDIR}${CACHEDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${ETCDIR}/http.d
 	${MKDIR} ${STAGEDIR}${ETCDIR}/stream.d
 	${MKDIR} ${STAGEDIR}${LOGDIR}
 	${MKDIR} ${STAGEDIR}${MODDIR}
 	${MKDIR} ${STAGEDIR}${WWWDIR}/html
 
 	${RLN} ${STAGEDIR}${MODDIR} ${STAGEDIR}${ETCDIR}/modules
 
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/angie \
 	    ${STAGEDIR}${PREFIX}/sbin/angie-nodebug
 
 	${LN} -fs angie-nodebug ${STAGEDIR}${PREFIX}/sbin/angie
 
-	${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${PREFIX}/share/man/man8
 .for i in CHANGES CHANGES.ru README.rst
 	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .for i in fastcgi.conf fastcgi_params mime.types scgi_params uwsgi_params
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/conf/prometheus_all.conf \
 	    ${STAGEDIR}${ETCDIR}/prometheus_all.conf.sample
 
 	${INSTALL_DATA} ${WRKDIR}/angie.conf.sample \
 	    ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/default.conf.sample \
 	    ${STAGEDIR}${ETCDIR}/http.d
 	${INSTALL_DATA} ${WRKDIR}/example.conf.sample \
 	    ${STAGEDIR}${ETCDIR}/stream.d
 .for i in 50x.html index.html
 	${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}${WWWDIR}/html/${i}
 .endfor
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${BINMODE} ${WRKSRC_DEBUG}/objs/angie \
 	    ${STAGEDIR}${PREFIX}/sbin/angie-debug
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/angie/pkg-plist b/www/angie/pkg-plist
index 2c77c1a62d2e..28b3b43178bd 100644
--- a/www/angie/pkg-plist
+++ b/www/angie/pkg-plist
@@ -1,29 +1,29 @@
 @dir %%ETCDIR%%/http.d
 @dir %%ETCDIR%%/stream.d
 @dir %%CACHEDIR%%
 @dir %%LOGDIR%%
 @dir %%MODDIR%%
 
 %%ETCDIR%%/modules
 
 sbin/angie-nodebug
 sbin/angie
 %%DEBUG%%sbin/angie-debug
 
-man/man8/angie.8.gz
+share/man/man8/angie.8.gz
 %%DOCSDIR%%/CHANGES
 %%DOCSDIR%%/CHANGES.ru
 %%DOCSDIR%%/README.rst
 
 @sample %%ETCDIR%%/angie.conf.sample
 @sample %%ETCDIR%%/fastcgi.conf.sample
 @sample %%ETCDIR%%/fastcgi_params.sample
 @sample %%ETCDIR%%/mime.types.sample
 @sample %%ETCDIR%%/prometheus_all.conf.sample
 @sample %%ETCDIR%%/scgi_params.sample
 @sample %%ETCDIR%%/uwsgi_params.sample
 @sample %%ETCDIR%%/http.d/default.conf.sample
 @sample %%ETCDIR%%/stream.d/example.conf.sample
 
 %%WWWDIR%%/html/50x.html
 %%WWWDIR%%/html/index.html
diff --git a/www/edbrowse/Makefile b/www/edbrowse/Makefile
index c8274684bdb0..27e47f837327 100644
--- a/www/edbrowse/Makefile
+++ b/www/edbrowse/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	edbrowse
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www editors
 
 MAINTAINER=	alfix86@gmail.com
 COMMENT=	Line-oriented web browser and text editor
 WWW=		https://edbrowse.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libquickjs.so:lang/quickjs \
 		libodbc.so:databases/unixODBC \
 		libpcre2-8.so:devel/pcre2
 
 USES=		compiler:c11 gmake perl5 pkgconfig readline ssl
 USE_PERL5=	build
 USE_GITHUB=	yes
 
 MAKEFILE=	makefile
 
 GH_ACCOUNT=	CMB
 
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/man-edbrowse-freebsd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
+	${INSTALL_MAN} ${WRKSRC}/doc/man-edbrowse-freebsd.1 ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
 	${INSTALL_PROGRAM} ${WRKSRC}/src/edbrowse ${STAGEDIR}${PREFIX}/bin
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && \
 		${FIND} . \( -name article.wikipedia -or -name "man-edbrowse*" \) -delete  && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/gatling/Makefile b/www/gatling/Makefile
index 27380b88487e..1605e57a0eca 100644
--- a/www/gatling/Makefile
+++ b/www/gatling/Makefile
@@ -1,103 +1,104 @@
 PORTNAME=	gatling
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	www benchmarks ftp
 MASTER_SITES=	https://www.fefe.de/gatling/
 
 MAINTAINER=	coco@executive-computing.de
 COMMENT=	High performance web server with scalability benchmark tools
 WWW=		https://www.fefe.de/gatling/
 
 LICENSE=	GPLv2
 
 BROKEN_mips=	fails to compile: dirfd.c: error: expected ';', ',' or ')' before 'key'
 BROKEN_mips64=	fails to compile: dirfd.c: error: expected ';', ',' or ')' before 'key'
 
 BUILD_DEPENDS=	libowfat>=0.32:devel/libowfat
 
 USES=		compiler:c++11-lang gmake localbase:ldflags ssl tar:xz
 USE_RC_SUBR=	gatling
 
 MAKEFILE=	GNUmakefile
 
 CFLAGS+=	-I${LOCALBASE}/include/libowfat -I${OPENSSLINC}
 # Make alloca() prototype visible
 CFLAGS+=	-D__BSD_VISIBLE
 # Make crypt() prototype visible
 CFLAGS+=	-D__XSI_VISIBLE
 LDFLAGS+=	-L${OPENSSLLIB}
 
 PLIST_FILES=	${PLIST_BIN:S,^,bin/,} \
 		${PLIST_SBIN:S,^,sbin/,} \
-		man/man8/gatling.8.gz \
+		share/man/man8/gatling.8.gz \
 		sbin/gatling_wrapper
 
 PORTDOCS=	CHANGES README README.antidos README.cgi README.ftp \
 		README.htaccess README.http README.performance README.prefetch \
 		README.proxy README.redirect
 PORTEXAMPLES=	acc cgi getlinks hcat hitprofile matchiprange referrer \
 		run-gatling
 
 OPTIONS_DEFINE=		BENCHMARKS BROKEN_ITOJUN_V6 DEBUG DOCS EXAMPLES \
 			OPTIMIZED_CFLAGS SMB TLS ZLIB
 OPTIONS_DEFAULT=	BENCHMARKS OPTIMIZED_CFLAGS SMB TLS ZLIB
 OPTIONS_SUB=		yes
 
 BENCHMARKS_DESC=	Install some benchmark programs
 BROKEN_ITOJUN_V6_DESC=	Works around problems binding to IPv4 addresses
 TLS_DESC=		Build and install tlsgatling
 ZLIB_DESC=		Compress outgoing data
 
 BENCHMARKS_MAKE_ENV=		BENCHMARKS=1
-BENCHMARKS_PLIST_FILES=		man/man1/bench.1.gz
+BENCHMARKS_PLIST_FILES=		share/man/man1/bench.1.gz
 BENCHMARKS_PORTDOCS=		README.bindbench README.forkbench \
 				README.httpbench README.manymapbench \
 				README.mmapbench
 BENCHMARKS_PORTEXAMPLES=	prep run-bench
 BENCHMARKS_VARS=		BENCH1=bench.1 \
 		PLIST_BIN+=bindbench forkbench forksbench httpbench ioerr manymapbench mktestdata mmapbench pthreadbench
 # Causes a warning about "KAME madness" but works around
 # gatling failing to bind to IPv4 addresses.
 BROKEN_ITOJUN_V6_CFLAGS=	-D__broken_itojun_v6__
 DEBUG_MAKE_ENV=			DEBUG=1
 DEBUG_VARS=			STRIP=
 SMB_USES=			iconv
 SMB_MAKE_ENV=			ICONV=1
 SMB_EXTRA_PATCHES_OFF=		${PATCHDIR}/extra-patch-disable_smb
 TLS_MAKE_ENV=			TLSGATLING=1
 TLS_PORTDOCS=			README.tls
 TLS_VARS=			PLIST_SBIN+=tlsgatling
 ZLIB_MAKE_ENV=			ZLIB=1
 
 PLIST_BIN=	dl
 PLIST_SBIN=	gatling
 GATLING8=	gatling.8
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && !defined(WITH_DEBUG)
 CFLAGS+=	-O2 -fomit-frame-pointer
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's/\(trymd5.c\) \(-lcrypto\)/\1 $$(LDFLAGS) \2/'	\
 		${WRKSRC}/GNUmakefile
 
 pre-install:
 	cd ${WRKSRC} && ${CP} gatling.1 gatling.8
 
 do-install:
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_BIN} ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_SBIN} ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${FILESDIR}/gatling_wrapper ${STAGEDIR}${PREFIX}/sbin
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .if !empty(BENCH1)
-	cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${MAN1PREFIX}/man/man1
+	cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${PREFIX}/share/man/man1
 .endif
-	cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${MAN8PREFIX}/man/man8
+	cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${PREFIX}/share/man/man8
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/www/gist/Makefile b/www/gist/Makefile
index 8bbe64566520..abe441372c64 100644
--- a/www/gist/Makefile
+++ b/www/gist/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	gist
 PORTVERSION=	6.0.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www net
 
 MAINTAINER=	changlp@cs.nctu.edu.tw
 COMMENT=	Gist pastebin posting command
 WWW=		https://github.com/defunkt/gist/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.MIT
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		ruby:run
 USE_GITHUB=	yes
 GH_ACCOUNT=	defunkt
 
 CONFLICTS=	p5-App-gist py*-python-gist yorick # bin/gist
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/gist \
-		man/man1/gist.1.gz
+		share/man/man1/gist.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build/gist
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/build/gist ${STAGEDIR}${PREFIX}/bin/gist
-	${INSTALL_MAN} ${WRKSRC}/build/gist.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/build/gist.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/www/micro_httpd/Makefile b/www/micro_httpd/Makefile
index 1be2b6d32a94..6e2965597098 100644
--- a/www/micro_httpd/Makefile
+++ b/www/micro_httpd/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	micro_httpd
 PORTVERSION=	2014.08.14
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/micro_httpd/
 DISTNAME=	${PORTNAME}_14Aug2014
 
 MAINTAINER=	user@unknown.nu
 COMMENT=	Extremely small web server
 WWW=		https://www.acme.com/software/micro_httpd/
 
 LICENSE=	BSD2CLAUSE
 
 USES=		cpe
 CPE_VENDOR=	acme
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_FILES=	sbin/micro_httpd man/man8/micro_httpd.8.gz
+PLIST_FILES=	sbin/micro_httpd share/man/man8/micro_httpd.8.gz
 
 ALL_TARGET=	${PORTNAME}
 
 post-patch:
 	${REINPLACE_CMD} 's|-O|${CFLAGS}|' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/micro_httpd ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/micro_httpd.8 ${STAGEDIR}${MAN1PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/micro_httpd.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 73f4a779b100..187c85c7ffc7 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,382 +1,382 @@
 PORTNAME?=	nginx
 PORTVERSION=	1.25.3
 PORTREVISION=	11
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
 PKGNAMESUFFIX?=	-devel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	osa@FreeBSD.org
 COMMENT?=	Robust and small WWW server
 WWW=		https://nginx.com/
 
 LICENSE?=	BSD2CLAUSE
 LICENSE_FILE?=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	nginx
 
 PORTSCOUT=	limit:^1\.2[4-5]\.[0-9]*
 
 USES=		cpe
 
 CPE_VENDOR=	f5
 CPE_PRODUCT=	nginx
 USE_GITHUB=	nodefault
 
 NGINX_VARDIR?=	/var
 NGINX_LOGDIR?=	${NGINX_VARDIR}/log/nginx
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
 NGINX_TMPDIR?=	${NGINX_VARDIR}/tmp/nginx
 HTTP_PORT?=	80
 
 NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
 NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
 
 CONFLICTS?=	nginx-1.* \
 		nginx-full-1.* \
 		nginx-lite-1.* \
 		nginx-naxsi-1.*
 USE_RC_SUBR?=	nginx
 SUB_FILES?=	pkg-message
 SUB_LIST+=	WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP} \
 		NGINX_RUNDIR=${NGINX_RUNDIR} \
 		NGINX_TMPDIR=${NGINX_TMPDIR} \
 		PREFIX=${PREFIX}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${ETCDIR} \
 		--with-cc-opt="-I ${LOCALBASE}/include" \
 		--conf-path=${ETCDIR}/nginx.conf \
 		--sbin-path=${PREFIX}/sbin/nginx \
 		--pid-path=${NGINX_RUNDIR}/nginx.pid \
 		--error-log-path=${NGINX_ERRORLOG} \
 		--user=${WWWOWN} --group=${WWWGRP} \
 		--with-compat \
 		--with-pcre
 ALL_TARGET=
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
 
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_GROUP=	HTTPGRP MAILGRP STREAMGRP
 # Modules that are part of the base nginx distribution
 OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
 	HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \
 	HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \
 	HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 	HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_LSSL \
 	HTTPV3_QTLS
 
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 
 OPTIONS_GROUP_STREAMGRP=	STREAM STREAM_REALIP STREAM_SSL \
 	STREAM_SSL_PREREAD
 
 OPTIONS_DEFINE=		DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_XML OTEL THREADS WWW
 OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
 		HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \
 		HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 		HTTP_STATUS HTTP_SUB HTTPV2 HTTPV3 MAIL MAIL_SSL STREAM \
 		STREAM_REALIP STREAM_SSL STREAM_SSL_PREREAD THREADS WWW
 
 LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 
 OPTIONS_RADIO+=		GSSAPI
 OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
 GSSAPI_MIT_USES=	gssapi:mit
 
 OPTIONS_SUB=	yes
 
 .include "Makefile.options.desc"
 
 .for opt in ${OPTIONS_GROUP_MAILGRP:NMAIL}
 ${opt}_IMPLIES=	MAIL
 .endfor
 
 .for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} WWW
 ${opt}_IMPLIES=	HTTP
 .endfor
 
 .for opt in ${OPTIONS_GROUP_STREAMGRP:NSTREAM}
 ${opt}_IMPLIES=	STREAM
 .endfor
 
 GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
 GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
 
 # If the target is makesum, make sure that every distfile is fetched.
 .if ${.TARGETS:Mmakesum}
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTPGRP} \
 	${OPTIONS_GROUP_MAILGRP} ${OPTIONS_GROUP_STREAMGRP} \
 	${OPTIONS_GROUP_THIRDPARTYGRP}
 .endif
 
 # Non-module options handling
 DEBUG_CFLAGS=		-g
 DEBUG_VARS=		STRIP=#do not strip if nginx with debug information
 DEBUGLOG_CONFIGURE_ON=	--with-debug
 DSO_CONFIGURE_ON=	--modules-path=${MODULESDIR}
 DSO_VARS=		MODULESDIR=${PREFIX}/libexec/${PORTNAME}
 FILE_AIO_CONFIGURE_ON=	--with-file-aio
 IPV6_CONFIGURE_OFF=	--with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include"
 THREADS_CONFIGURE_ON=	--with-threads
 
 # Bundled modules
 GOOGLE_PERFTOOLS_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 GOOGLE_PERFTOOLS_CONFIGURE_ON=	--with-google_perftools_module
 HTTP_CONFIGURE_ON=		--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
 				--http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \
 				--http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \
 				--http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \
 				--http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \
 				--http-log-path=${NGINX_ACCESSLOG}
 HTTP_CONFIGURE_OFF=		--without-http
 HTTP_ADDITION_CONFIGURE_ON=	--with-http_addition_module
 HTTP_AUTH_REQ_CONFIGURE_ON=	--with-http_auth_request_module
 HTTP_CACHE_CONFIGURE_OFF=	--without-http-cache
 HTTP_DAV_CONFIGURE_ON=		--with-http_dav_module
 HTTP_DEGRADATION_CONFIGURE_ON=	--with-http_degradation_module
 HTTP_FLV_CONFIGURE_ON=		--with-http_flv_module
 HTTP_GZIP_STATIC_CONFIGURE_ON=	--with-http_gzip_static_module
 HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module
 HTTP_IMAGE_FILTER_LIB_DEPENDS=	libgd.so:graphics/gd
 HTTP_IMAGE_FILTER_VARS=		DSO_BASEMODS+=http_image_filter_module
 HTTP_MP4_CONFIGURE_ON=		--with-http_mp4_module
 HTTP_PERL_CATEGORIES=		perl5
 HTTP_PERL_USES=			perl5
 # Fix build failure on clang >= 12
 HTTP_PERL_CFLAGS=		-Wno-compound-token-split-by-macro
 HTTP_PERL_VARS=			DSO_BASEMODS+=http_perl_module
 HTTP_RANDOM_INDEX_CONFIGURE_ON=	--with-http_random_index_module
 HTTP_REALIP_CONFIGURE_ON=	--with-http_realip_module
 HTTP_SECURE_LINK_CONFIGURE_ON=	--with-http_secure_link_module
 HTTP_SLICE_CONFIGURE_ON=	--with-http_slice_module
 HTTP_SSL_CONFIGURE_ON=		--with-http_ssl_module
 HTTP_SSL_USES=			ssl
 HTTP_STATUS_CONFIGURE_ON=	--with-http_stub_status_module
 HTTP_SUB_CONFIGURE_ON=		--with-http_sub_module
 HTTP_XSLT_CONFIGURE_ON=		--with-http_xslt_module
 HTTP_XSLT_LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
 				libxslt.so:textproc/libxslt
 HTTP_XSLT_VARS=			DSO_BASEMODS+=http_xslt_module
 HTTPV2_IMPLIES=			HTTP_SSL
 HTTPV2_CONFIGURE_ON=		--with-http_v2_module
 HTTPV3_CONFIGURE_ON=		--with-http_v3_module
 HTTPV3_BORING_BUILD_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_RUN_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_IMPLIES=		HTTPV3
 HTTPV3_BORING_PREVENTS=		HTTPV3_LSSL HTTPV3_QTLS
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_IMPLIES=		HTTPV3
 HTTPV3_LSSL_PREVENTS=		HTTPV3_BORING HTTPV3_QTLS
 HTTPV3_QTLS_BUILD_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_RUN_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_IMPLIES=		HTTPV3
 HTTPV3_QTLS_PREVENTS=		HTTPV3_BORING HTTPV3_LSSL
 MAIL_VARS=			DSO_BASEMODS+=mail
 MAIL_IMAP_CONFIGURE_OFF=	--without-mail_imap_module
 MAIL_POP3_CONFIGURE_OFF=	--without-mail_pop3_module
 MAIL_SMTP_CONFIGURE_OFF=	--without-mail_smtp_module
 MAIL_SSL_USES=			ssl
 MAIL_SSL_CONFIGURE_ON=		--with-mail_ssl_module
 STREAM_VARS=			DSO_BASEMODS+=stream
 STREAM_REALIP_CONFIGURE_ON=	--with-stream_realip_module
 STREAM_SSL_USES=		ssl
 STREAM_SSL_CONFIGURE_ON=	--with-stream_ssl_module
 STREAM_SSL_PREREAD_CONFIGURE_ON=--with-stream_ssl_preread_module
 
 ### External modules
 .include "Makefile.extmod"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDSO}
 _addbasemod=	=dynamic
 _addextmod=	add-dynamic-module
 .else
 _addextmod=	add-module
 .endif
 
 .for mod in ${DSO_BASEMODS}
 CONFIGURE_ARGS+=	--with-${mod}${_addbasemod}
 .endfor
 
 # Some modules depend on other being there before, for example, devel_kit needs
 # to be there before a few other.
 .for mod in ${FIRST_DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 
 .for mod in ${DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 # For non-GitHub hosted modules
 .for moddir in ${DSO_EXTDIRS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKDIR}/${moddir}
 .endfor
 
 .if empty(PORT_OPTIONS:MHTTP) && empty(PORT_OPTIONS:MMAIL)
 IGNORE=		requires at least HTTP or MAIL to \
 		be defined.  Please do 'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT))
 IGNORE=		required at least GSSAPI_HEIMDAL or \
 		GSSAPI_MIT to be defined. Please do \
 		'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER} && empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
 CONFIGURE_ENV+=	EXTRA_PRE_CXXFLAGS="-std=c++14"
 .endif
 
 .if empty(PORT_OPTIONS:MMODSECURITY3) && empty(PORT_OPTIONS:MPASSENGER)
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib"
 .else
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib -lpcre"
 LIB_DEPENDS+=		libpcre.so:devel/pcre
 .endif
 
 .if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML)
 CONFIGURE_ENV+=		NJS_LIBXSLT=NO
 NJS_CONFIGURE_ARGS=	--no-libxml2
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 .if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR}
 	@${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support"
 .endif
 .if ${PORT_OPTIONS:MPASSENGER}
 	@${ECHO_MSG} "This port install Passenger module only"
 .endif
 	@${ECHO_MSG}
 
 post-extract-NAXSI-on:
 	@${RMDIR} ${WRKSRC_naxsi}/naxsi_src/libinjection
 	@${LN} -s ${WRKSRC_libinjection} ${WRKSRC_naxsi}/naxsi_src/libinjection
 
 pre-patch-HTTPV3-on:
 	@${MV} ${WRKSRC}/README ${WRKSRC}/README.1st
 
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!; \
 		s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \
 		${WRKSRC}/conf/nginx.conf
 
 post-patch-BROTLI-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_brotli}/filter/config
 
 post-patch-DRIZZLE-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_drizzle}/config
 
 post-patch-FASTDFS-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${PREFIX}!g;s!%%LOCALBASE%%!${LOCALBASE}!g' \
 		${WRKSRC_fastdfs}/src/config
 
 post-patch-GRIDFS-on:
 	@${REINPLACE_CMD} 's!\/usr!${LOCALBASE}!g' \
 		${WRKSRC_gridfs}/nginx-gridfs/config
 
 post-patch-HTTP_AUTH_KRB5-on:
 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
 		s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g; \
 		s!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!g' ${WRKSRC_auth_krb5}/config
 
 post-patch-HTTP_TARANTOOL-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
 
 post-patch-ICONV-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config
 
 post-patch-PASSENGER-on:
 	@${REINPLACE_CMD} \
 		'168,170s!true!false!' \
 		${WRKSRC_PASSENGER}/build/basics.rb
 	@${REINPLACE_CMD} \
 		's!-I/usr/include/libev!!; \
 		s!-lev!!; \
 		s!-Iext/libev!!; \
 		s!-I/usr/include/libeio!!; \
 		s!-leio!!; \
 		s!-Iext/libeio!!' \
 		${WRKSRC_PASSENGER}/build/common_library.rb
 
 post-patch-POSTGRES-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_postgres}/config
 
 post-patch-SFLOW-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
 		${WRKSRC_sflow}/ngx_http_sflow_config.h
 
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
 .if !target(do-install)
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
 .for i in koi-utf koi-win win-utf
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}
 .endfor
 .for i in fastcgi_params mime.types scgi_params uwsgi_params
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}-dist
 .endfor
 
 do-install-HTTP_PERL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
 
 # Install dynamic modules
 do-install-DSO-on:
 	${MKDIR} ${STAGEDIR}${MODULESDIR}
 	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
 		-exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${MODULESDIR} \;)
 
 do-install-LINK-on:
 	${INSTALL_DATA} ${WRKSRC_link}/src/ngx_link_func_module.h ${STAGEDIR}${PREFIX}/include
 
 do-install-NAXSI-on:
 	${INSTALL_DATA} \
 	${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_rules/naxsi_core.rules \
 	${STAGEDIR}${ETCDIR}
 .endif
 
 .if !target(post-install)
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles
-	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8
+	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist
 
 post-install-WWW-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist
 	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/nginx-dist && \
 	${TOUCH} ${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index e18aca01d390..a5cb24a6812a 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,402 +1,402 @@
 PORTNAME=	nginx
 PORTVERSION=	1.24.0
 PORTREVISION?=	14
 PORTEPOCH=	3
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/joneum
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	joneum@FreeBSD.org
 COMMENT?=	Robust and small WWW server
 WWW=		https://nginx.com/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	nginx-devel
 
 PORTSCOUT=	limit:^1\.24\.[0-9]*
 
 USES=		cpe
 
 CPE_VENDOR=	f5
 CPE_PRODUCT=	nginx
 USE_GITHUB=	nodefault
 
 NGINX_VARDIR?=	/var
 NGINX_LOGDIR?=	${NGINX_VARDIR}/log/nginx
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
 NGINX_TMPDIR?=	${NGINX_VARDIR}/tmp/nginx
 HTTP_PORT?=	80
 
 NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
 NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
 
 CONFLICTS?=	nginx-devel-1.* \
 		nginx-full-1.* \
 		nginx-lite-1.* \
 		nginx-naxsi-1.*
 USE_RC_SUBR?=	nginx
 SUB_FILES?=	pkg-message
 SUB_LIST+=	WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP} \
 		NGINX_RUNDIR=${NGINX_RUNDIR} \
 		NGINX_TMPDIR=${NGINX_TMPDIR} \
 		PREFIX=${PREFIX}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${ETCDIR} \
 		--with-cc-opt="-I ${LOCALBASE}/include" \
 		--conf-path=${ETCDIR}/nginx.conf \
 		--sbin-path=${PREFIX}/sbin/nginx \
 		--pid-path=${NGINX_RUNDIR}/nginx.pid \
 		--error-log-path=${NGINX_ERRORLOG} \
 		--user=${WWWOWN} --group=${WWWGRP} \
 		--with-compat \
 		--with-pcre
 ALL_TARGET=
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
 
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_GROUP=	HTTPGRP MAILGRP STREAMGRP
 # Modules that are part of the base nginx distribution
 OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
 	HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \
 	HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \
 	HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 	HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_LSSL \
 	HTTPV3_QTLS
 
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 
 OPTIONS_GROUP_STREAMGRP=	STREAM STREAM_REALIP STREAM_SSL \
 	STREAM_SSL_PREREAD
 
 OPTIONS_DEFINE=		DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_XML THREADS WWW
 OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
 		HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \
 		HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 		HTTP_STATUS HTTP_SUB HTTPV2 MAIL MAIL_SSL STREAM \
 		STREAM_REALIP STREAM_SSL STREAM_SSL_PREREAD THREADS WWW
 
 LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 
 OPTIONS_RADIO+=		GSSAPI
 OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
 GSSAPI_MIT_USES=	gssapi:mit
 
 OPTIONS_SUB=	yes
 
 .include "Makefile.options.desc"
 
 .for opt in ${OPTIONS_GROUP_MAILGRP:NMAIL}
 ${opt}_IMPLIES=	MAIL
 .endfor
 
 .for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} WWW
 ${opt}_IMPLIES=	HTTP
 .endfor
 
 .for opt in ${OPTIONS_GROUP_STREAMGRP:NSTREAM}
 ${opt}_IMPLIES=	STREAM
 .endfor
 
 GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
 GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
 
 # If the target is makesum, make sure that every distfile is fetched.
 .if ${.TARGETS:Mmakesum}
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTPGRP} \
 	${OPTIONS_GROUP_MAILGRP} ${OPTIONS_GROUP_STREAMGRP} \
 	${OPTIONS_GROUP_THIRDPARTYGRP}
 .endif
 
 # Non-module options handling
 DEBUG_CFLAGS=		-g
 DEBUG_VARS=		STRIP=#do not strip if nginx with debug information
 DEBUGLOG_CONFIGURE_ON=	--with-debug
 DSO_CONFIGURE_ON=	--modules-path=${MODULESDIR}
 DSO_VARS=		MODULESDIR=${PREFIX}/libexec/${PORTNAME}
 FILE_AIO_CONFIGURE_ON=	--with-file-aio
 IPV6_CONFIGURE_OFF=	--with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include"
 THREADS_CONFIGURE_ON=	--with-threads
 
 # Bundled modules
 GOOGLE_PERFTOOLS_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 GOOGLE_PERFTOOLS_CONFIGURE_ON=	--with-google_perftools_module
 HTTP_CONFIGURE_ON=		--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
 				--http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \
 				--http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \
 				--http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \
 				--http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \
 				--http-log-path=${NGINX_ACCESSLOG}
 HTTP_CONFIGURE_OFF=		--without-http
 HTTP_ADDITION_CONFIGURE_ON=	--with-http_addition_module
 HTTP_AUTH_REQ_CONFIGURE_ON=	--with-http_auth_request_module
 HTTP_CACHE_CONFIGURE_OFF=	--without-http-cache
 HTTP_DAV_CONFIGURE_ON=		--with-http_dav_module
 HTTP_DEGRADATION_CONFIGURE_ON=	--with-http_degradation_module
 HTTP_FLV_CONFIGURE_ON=		--with-http_flv_module
 HTTP_GZIP_STATIC_CONFIGURE_ON=	--with-http_gzip_static_module
 HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module
 HTTP_IMAGE_FILTER_LIB_DEPENDS=	libgd.so:graphics/gd
 HTTP_IMAGE_FILTER_VARS=		DSO_BASEMODS+=http_image_filter_module
 HTTP_MP4_CONFIGURE_ON=		--with-http_mp4_module
 HTTP_PERL_CATEGORIES=		perl5
 HTTP_PERL_USES=			perl5
 # Fix build failure on clang >= 12
 HTTP_PERL_CFLAGS=		-Wno-compound-token-split-by-macro
 HTTP_PERL_VARS=			DSO_BASEMODS+=http_perl_module
 HTTP_RANDOM_INDEX_CONFIGURE_ON=	--with-http_random_index_module
 HTTP_REALIP_CONFIGURE_ON=	--with-http_realip_module
 HTTP_SECURE_LINK_CONFIGURE_ON=	--with-http_secure_link_module
 HTTP_SLICE_CONFIGURE_ON=	--with-http_slice_module
 HTTP_SSL_CONFIGURE_ON=		--with-http_ssl_module
 HTTP_SSL_USES=			ssl
 HTTP_STATUS_CONFIGURE_ON=	--with-http_stub_status_module
 HTTP_SUB_CONFIGURE_ON=		--with-http_sub_module
 HTTP_XSLT_CONFIGURE_ON=		--with-http_xslt_module
 HTTP_XSLT_LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
 				libxslt.so:textproc/libxslt
 HTTP_XSLT_VARS=			DSO_BASEMODS+=http_xslt_module
 HTTPV2_IMPLIES=			HTTP_SSL
 HTTPV2_CONFIGURE_ON=		--with-http_v2_module
 HTTPV3_CONFIGURE_ON=		--build=nginx-quic \
 				--with-stream_quic_module \
 				--with-http_v3_module
 HTTPV3_EXTRA_PATCHES=		${PATCHDIR}/extra-patch-httpv3:-p1
 HTTPV3_BORING_BUILD_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_RUN_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_IMPLIES=		HTTPV3
 HTTPV3_BORING_PREVENTS=		HTTPV3_LSSL HTTPV3_QTLS
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_IMPLIES=		HTTPV3
 HTTPV3_LSSL_PREVENTS=		HTTPV3_BORING HTTPV3_QTLS
 HTTPV3_QTLS_BUILD_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_RUN_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_IMPLIES=		HTTPV3
 HTTPV3_QTLS_PREVENTS=		HTTPV3_BORING HTTPV3_LSSL
 MAIL_VARS=			DSO_BASEMODS+=mail
 MAIL_IMAP_CONFIGURE_OFF=	--without-mail_imap_module
 MAIL_POP3_CONFIGURE_OFF=	--without-mail_pop3_module
 MAIL_SMTP_CONFIGURE_OFF=	--without-mail_smtp_module
 MAIL_SSL_USES=			ssl
 MAIL_SSL_CONFIGURE_ON=		--with-mail_ssl_module
 STREAM_VARS=			DSO_BASEMODS+=stream
 STREAM_REALIP_CONFIGURE_ON=	--with-stream_realip_module
 STREAM_SSL_USES=		ssl
 STREAM_SSL_CONFIGURE_ON=	--with-stream_ssl_module
 STREAM_SSL_PREREAD_CONFIGURE_ON=--with-stream_ssl_preread_module
 
 ### External modules
 .include "Makefile.extmod"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDSO}
 _addbasemod=	=dynamic
 _addextmod=	add-dynamic-module
 .else
 _addextmod=	add-module
 .endif
 
 .for mod in ${DSO_BASEMODS}
 CONFIGURE_ARGS+=	--with-${mod}${_addbasemod}
 .endfor
 
 # Some modules depend on other being there before, for example, devel_kit needs
 # to be there before a few other.
 .for mod in ${FIRST_DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 
 .for mod in ${DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 # For non-GitHub hosted modules
 .for moddir in ${DSO_EXTDIRS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKDIR}/${moddir}
 .endfor
 
 .if empty(PORT_OPTIONS:MHTTP) && empty(PORT_OPTIONS:MMAIL)
 IGNORE=		requires at least HTTP or MAIL to \
 		be defined.  Please do 'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT))
 IGNORE=		required at least GSSAPI_HEIMDAL or \
 		GSSAPI_MIT to be defined. Please do \
 		'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER} && empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
 CONFIGURE_ENV+=	EXTRA_PRE_CXXFLAGS="-std=c++14"
 .endif
 
 .if empty(PORT_OPTIONS:MLUA) && empty(PORT_OPTIONS:MMODSECURITY3) && \
     empty(PORT_OPTIONS:MPASSENGER)
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib"
 .else
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib -lpcre"
 LIB_DEPENDS+=		libpcre.so:devel/pcre
 .endif
 
 .if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML)
 CONFIGURE_ENV+=		NJS_LIBXSLT=NO
 NJS_CONFIGURE_ARGS=	--no-libxml2
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 .if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR}
 	@${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support"
 .endif
 .if ${PORT_OPTIONS:MPASSENGER}
 	@${ECHO_MSG} "This port install Passenger module only"
 .endif
 	@${ECHO_MSG}
 
 post-extract-NAXSI-on:
 	@${MKDIR} ${WRKDIR}/naxsi-${NAXSI_NGINX_VER}
 	@${MV} ${WRKDIR}/naxsi_rules ${WRKDIR}/naxsi_src \
 		${WRKDIR}/naxsi-${NAXSI_NGINX_VER}
 
 pre-patch-HTTPV3-on:
 	@${MV} ${WRKSRC}/README ${WRKSRC}/README.1st
 
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!; \
 		s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \
 		${WRKSRC}/conf/nginx.conf
 
 post-patch-BROTLI-on:
 	@${REINPLACE_CMD} -E 's!^brotli=.*!brotli="${LOCALBASE}"!' ${WRKSRC_brotli}/config
 
 post-patch-DRIZZLE-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_drizzle}/config
 
 post-patch-FASTDFS-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${PREFIX}!g;s!%%LOCALBASE%%!${LOCALBASE}!g' \
 		${WRKSRC_fastdfs}/src/config
 
 post-patch-GRIDFS-on:
 	@${REINPLACE_CMD} 's!\/usr!${LOCALBASE}!g' \
 		${WRKSRC_gridfs}/nginx-gridfs/config
 
 post-patch-HTTP_AUTH_KRB5-on:
 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
 		s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g; \
 		s!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!g' ${WRKSRC_auth_krb5}/config
 
 post-patch-HTTP_TARANTOOL-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
 
 # linker error acquire if --std=c99 defined, add "static" to inline function
 post-patch-HTTP_ZIP-on:
 	@${REINPLACE_CMD} \
 		's!^inline!static inline!' \
 		${WRKSRC_mod_zip}/ngx_http_zip_parsers.*
 
 post-patch-ICONV-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config
 
 post-patch-NAXSI-on:
 	@${REINPLACE_CMD} 's!MSIZE!TOK_MSIZE!g' \
 		${WRKSRC_naxsi}/naxsi_src/libinjection/src/libinjection_sqli.c
 
 post-patch-PASSENGER-on:
 	@${REINPLACE_CMD} \
 		'177,179s!true!false!' \
 		${WRKSRC_PASSENGER}/build/basics.rb
 	@${REINPLACE_CMD} \
 		's!-I/usr/include/libev!!; \
 		s!-lev!!; \
 		s!-Iext/libev!!; \
 		s!-I/usr/include/libeio!!; \
 		s!-leio!!; \
 		s!-Iext/libeio!!' \
 		${WRKSRC_PASSENGER}/build/common_library.rb
 
 post-patch-POSTGRES-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_postgres}/config
 
 post-patch-SFLOW-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
 		${WRKSRC_sflow}/ngx_http_sflow_config.h
 
 post-patch-VOD-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
 		${WRKSRC_vod}/config
 
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
 .if !target(do-install)
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
 .for i in koi-utf koi-win win-utf
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}
 .endfor
 .for i in fastcgi_params mime.types scgi_params uwsgi_params
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}-dist
 .endfor
 
 do-install-HTTP_PERL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
 
 # Install dynamic modules
 do-install-DSO-on:
 	${MKDIR} ${STAGEDIR}${MODULESDIR}
 	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
 		-exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${MODULESDIR} \;)
 
 do-install-LINK-on:
 	${INSTALL_DATA} ${WRKSRC_link}/src/ngx_link_func_module.h ${STAGEDIR}${PREFIX}/include
 
 do-install-NAXSI-on:
 	${INSTALL_DATA} \
 	${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_rules/naxsi_core.rules \
 	${STAGEDIR}${ETCDIR}
 .endif
 
 .if !target(post-install)
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles
-	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8
+	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist
 
 post-install-WWW-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist
 	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/nginx-dist && \
 	${TOUCH} ${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/oneshot/Makefile b/www/oneshot/Makefile
index 73e8834fb530..36b4bf9b1003 100644
--- a/www/oneshot/Makefile
+++ b/www/oneshot/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	oneshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	First-come-first-serve single-fire HTTP server
 WWW=		https://github.com/raphaelreyna/oneshot
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	nodefault
 GH_TUPLE=	golang:net:v0.8.0:net \
 		golang:sys:v0.6.0:sys
 
 _BUILD_VERSION=	${DISTVERSIONFULL}
 _BUILD_DATE=	$$(date +%d-%B-%Y)
 
 GO_MODULE=	github.com/raphaelreyna/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		${STRIP} -w \
 		-X ${GO_MODULE}/cmd.version=${_BUILD_VERSION} \
 		-X ${GO_MODULE}/cmd.date=${_BUILD_DATE}"
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=		DOCS MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 MANPAGES_DESC=	Build and install auto-generated manpages
 
 pre-patch:
 .for m in net sys
 	${RM} -r ${WRKSRC}/vendor/golang.org/x/$m
 	${LN} -s ${WRKDIR}/$m-* ${WRKSRC}/vendor/golang.org/x/$m
 .endfor
 
 do-build-MANPAGES-on:
 	cd ${GO_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} run ${GO_BUILDFLAGS} \
 		./doc/man/main.go > ${PORTNAME}.1
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${GO_WRKSRC}/${PORTDOCS} \
 		${STAGEDIR}${DOCSDIR}
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${GO_WRKSRC}/${PORTNAME}.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/www/oneshot/pkg-plist b/www/oneshot/pkg-plist
index 189e15e7a6af..6443c77a65f7 100644
--- a/www/oneshot/pkg-plist
+++ b/www/oneshot/pkg-plist
@@ -1,2 +1,2 @@
 bin/oneshot
-%%MANPAGES%%man/man1/oneshot.1.gz
+%%MANPAGES%%share/man/man1/oneshot.1.gz
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 06fdbe72a227..96e72acf9b15 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,115 +1,116 @@
 PORTNAME=	privoxy
 PORTVERSION=	3.0.34
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://www.privoxy.org/sf-download-mirror/Sources/${PORTVERSION}%20(stable)/ \
 		SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29
 DISTNAME=	privoxy-${PORTVERSION}-stable-src
 
 MAINTAINER=	fk@fabiankeil.de
 COMMENT=	Web proxy with advanced filtering capabilities
 WWW=		https://www.privoxy.org/
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		autoreconf cpe gmake shebangfix ssl
 USE_RC_SUBR=	privoxy
 
 SHEBANG_FILES=	tools/privoxy-log-parser.pl tools/privoxy-regression-test.pl \
 		tools/uagen.pl tools/url-pattern-translator.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-extended-statistics --enable-pcre-host-patterns
 
 MAKEFILE=	GNUmakefile
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # privoxy-devel is the development release available at the Privoxy website.
 # It's not (yet) part of the FreeBSD ports collection.
 CONFLICTS=	privoxy-devel
 
 SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/privoxy-${PORTVERSION}-stable
 
 USERS=		privoxy
 GROUPS=		privoxy
 
 OPTIONS_DEFINE=	ACCEPT_FILTER BROKEN_STRPTIME BROTLI COMPRESSION DEBUG \
 		DOCS EDITOR FORCE HTTPS_INSPECTION PRIVOXY_TOOLS TOGGLE
 
 OPTIONS_DEFAULT=	ACCEPT_FILTER BROTLI DOCS EDITOR FORCE \
 			HTTPS_INSPECTION TOGGLE PRIVOXY_TOOLS
 OPTIONS_SUB=	yes
 
 ACCEPT_FILTER_DESC=	Support for accf_http(9)
 BROKEN_STRPTIME_DESC=	Enable workaround for standards/173421
 BROTLI_DESC=		Support decompression of Brotli-encoded content
 COMPRESSION_DESC=	Support compression of buffered content
 DOCS_DESC=		Let Privoxy serve the user manual
 EDITOR_DESC=		Support use of the web-based action editor
 FORCE_DESC=		Support bypassing of blocks
 HTTPS_INSPECTION_DESC=	Support filtering of encrypted content
 PRIVOXY_TOOLS_DESC=	Install Privoxy-Log-Parser, uagen, etc.
 TOGGLE_DESC=		Support for remote toggling
 
 ACCEPT_FILTER_CONFIGURE_ON=	--enable-accept-filter
 
 BROKEN_STRPTIME_CONFIGURE_ON=	--enable-strptime-sanity-checks
 
 BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
 BROTLI_CONFIGURE_ON=	--with-brotli
 
 COMPRESSION_CONFIGURE_ON=	--enable-compression
 
 DEBUG_CONFIGURE_ON=	--with-debug
 
 EDITOR_CONFIGURE_OFF=	--disable-editor
 
 FORCE_CONFIGURE_OFF=	--disable-force
 
 HTTPS_INSPECTION_CONFIGURE_ON=	--with-openssl
 
 PRIVOXY_TOOLS_RUN_DEPENDS=	curl:ftp/curl
 PRIVOXY_TOOLS_USES=	perl5
 PRIVOXY_TOOLS_USE=	PERL5=run
 
 TOGGLE_CONFIGURE_OFF=	--disable-toggle
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's,^\(confdir\) \.,\1 ${PREFIX}/etc/privoxy,' \
 		-e 's,^\(logdir\) \.,\1 /var/log/privoxy,' \
 		-e 's,^\(actionsfile user\),#\1,' \
 		-e 's,^\(filterfile user\),#\1,' \
 		-e 's,^#\(listen-backlog -1\),\1,' \
 		${WRKSRC}/config
 	${REINPLACE_CMD} \
 		-e 's,\(/etc/privoxy\),${PREFIX}\1,' ${WRKSRC}/tools/uagen.pl
 
 post-patch-DOCS-on:
 	${REINPLACE_CMD} \
 		-e 's,^#\(user-manual\) https://www.privoxy.org/user-manual/,\1 ${DOCSDIR}/user-manual,' \
 		${WRKSRC}/config
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/privoxy/templates
 	${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${STAGEDIR}${PREFIX}/etc/privoxy/templates
 .for privoxy_tool in privoxy-log-parser.pl privoxy-regression-test.pl uagen.pl url-pattern-translator.pl
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/${privoxy_tool} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .for defaultfile in default.action default.filter regression-tests.action
 	${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${STAGEDIR}${PREFIX}/etc/privoxy
 .endfor
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for examplefile in config match-all.action trust user.action
 	${INSTALL_DATA} ${WRKSRC}/${examplefile} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
-	${INSTALL_MAN}  ${WRKSRC}/privoxy.8 ${STAGEDIR}${MAN1PREFIX}/man/man8
+	${INSTALL_MAN}  ${WRKSRC}/privoxy.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/user-manual
 	${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${STAGEDIR}${DOCSDIR}/user-manual
 	${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${STAGEDIR}${DOCSDIR}/user-manual
 
 .include <bsd.port.mk>
diff --git a/www/privoxy/pkg-plist b/www/privoxy/pkg-plist
index 5e6e4ad311fa..647e5210fa84 100644
--- a/www/privoxy/pkg-plist
+++ b/www/privoxy/pkg-plist
@@ -1,71 +1,71 @@
 %%PRIVOXY_TOOLS%%bin/privoxy-log-parser.pl
 %%PRIVOXY_TOOLS%%bin/privoxy-regression-test.pl
 %%PRIVOXY_TOOLS%%bin/uagen.pl
 %%PRIVOXY_TOOLS%%bin/url-pattern-translator.pl
 sbin/privoxy
-man/man8/privoxy.8.gz
+share/man/man8/privoxy.8.gz
 etc/privoxy/default.action
 etc/privoxy/default.filter
 etc/privoxy/regression-tests.action
 etc/privoxy/templates/blocked
 etc/privoxy/templates/cgi-error-404
 etc/privoxy/templates/cgi-error-bad-param
 etc/privoxy/templates/cgi-error-disabled
 etc/privoxy/templates/cgi-error-file
 etc/privoxy/templates/cgi-error-file-read-only
 etc/privoxy/templates/cgi-error-modified
 etc/privoxy/templates/cgi-error-parse
 etc/privoxy/templates/cgi-style.css
 etc/privoxy/templates/client-tags
 etc/privoxy/templates/connect-failed
 etc/privoxy/templates/connection-timeout
 etc/privoxy/templates/default
 etc/privoxy/templates/edit-actions-add-url-form
 etc/privoxy/templates/edit-actions-for-url
 etc/privoxy/templates/edit-actions-for-url-filter
 etc/privoxy/templates/edit-actions-for-url-string-action
 etc/privoxy/templates/edit-actions-list
 etc/privoxy/templates/edit-actions-list-button
 etc/privoxy/templates/edit-actions-list-section
 etc/privoxy/templates/edit-actions-list-url
 etc/privoxy/templates/edit-actions-remove-url-form
 etc/privoxy/templates/edit-actions-url-form
 etc/privoxy/templates/forwarding-failed
 etc/privoxy/templates/mod-local-help
 etc/privoxy/templates/mod-support-and-service
 etc/privoxy/templates/mod-title
 etc/privoxy/templates/mod-unstable-warning
 etc/privoxy/templates/no-server-data
 etc/privoxy/templates/no-such-domain
 etc/privoxy/templates/show-request
 etc/privoxy/templates/show-status
 etc/privoxy/templates/show-status-file
 etc/privoxy/templates/show-url-info
 etc/privoxy/templates/toggle
 etc/privoxy/templates/toggle-mini
 etc/privoxy/templates/untrusted
 etc/privoxy/templates/url-info-osd.xml
 etc/privoxy/templates/wpad.dat
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/actions-file.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/appendix.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/config.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/contact.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/files-in-use.jpg
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/filter-file.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/index.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/installation.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/introduction.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/p_doc.css
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/proxy2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/proxy_setup.jpg
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/quickstart.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/seealso.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/startup.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/templates.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/whatsnew.html
 %%EXAMPLESDIR%%/config
 %%EXAMPLESDIR%%/match-all.action
 %%EXAMPLESDIR%%/trust
 %%EXAMPLESDIR%%/user.action
diff --git a/www/py-django32/Makefile b/www/py-django32/Makefile
index 0876f884a45b..d64b0fbf24c5 100644
--- a/www/py-django32/Makefile
+++ b/www/py-django32/Makefile
@@ -1,71 +1,72 @@
 PORTNAME=	django
 PORTVERSION=	3.2.23
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI \
 		https://media.djangoproject.com/releases/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	32
 DISTNAME=	Django-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	High-level Python Web Framework
 WWW=		https://www.djangoproject.com/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asgiref>0:www/py-asgiref@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tblib>0:devel/py-tblib@${PY_FLAVOR}
 
 USES=		cpe python shebangfix
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
-PLIST_FILES=	man/man1/django-admin.1.gz
+PLIST_FILES=	share/man/man1/django-admin.1.gz
 PORTDOCS=	*
 
 SHEBANG_FILES=	django/bin/django-admin.py \
 		django/conf/project_template/manage.py-tpl
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django[0-9][0-9]
 
 CPE_VENDOR=	djangoproject
 
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 
 OPTIONS_DEFINE=	DOCS HTMLDOCS
 OPTIONS_GROUP=	DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 OPTIONS_DEFAULT=SQLITE
 HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=4.5.0,1:textproc/py-sphinx@${PY_FLAVOR}
 HTMLDOCS_IMPLIES=	DOCS
 HTMLDOCS_USES=		gmake
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${GMAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${PREFIX}/share/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"	* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
 
 post-install-HTMLDOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} tests/runtests.py --settings=test_sqlite
 
 .include <bsd.port.mk>
diff --git a/www/py-django42/Makefile b/www/py-django42/Makefile
index 1b9a8f13afcd..54ab78464241 100644
--- a/www/py-django42/Makefile
+++ b/www/py-django42/Makefile
@@ -1,68 +1,69 @@
 PORTNAME=	django
 PORTVERSION=	4.2.9
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI \
 		https://media.djangoproject.com/releases/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	42
 DISTNAME=	Django-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	High-level Python Web Framework
 WWW=		https://www.djangoproject.com/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asgiref>=3.6.0:www/py-asgiref@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.1:databases/py-sqlparse@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tblib>0:devel/py-tblib@${PY_FLAVOR}
 
 USES=		cpe python shebangfix
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
-PLIST_FILES=	man/man1/django-admin.1.gz
+PLIST_FILES=	share/man/man1/django-admin.1.gz
 PORTDOCS=	*
 
 SHEBANG_FILES=	django/conf/project_template/manage.py-tpl
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django[0-9][0-9]
 
 CPE_VENDOR=	djangoproject
 
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 
 OPTIONS_DEFINE=	DOCS HTMLDOCS
 OPTIONS_GROUP=	DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 OPTIONS_DEFAULT=SQLITE
 HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 HTMLDOCS_IMPLIES=	DOCS
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${PREFIX}/share/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"	* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
 
 post-install-HTMLDOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} tests/runtests.py --settings=test_sqlite
 
 .include <bsd.port.mk>
diff --git a/www/py-django50/Makefile b/www/py-django50/Makefile
index a77c4e3eedf5..adb382f283da 100644
--- a/www/py-django50/Makefile
+++ b/www/py-django50/Makefile
@@ -1,74 +1,75 @@
 PORTNAME=	django
 PORTVERSION=	5.0.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI \
 		https://media.djangoproject.com/releases/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	50
 DISTNAME=	Django-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	High-level Python Web Framework
 WWW=		https://www.djangoproject.com/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asgiref>=3.7.0:www/py-asgiref@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.1:databases/py-sqlparse@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tblib>0:devel/py-tblib@${PY_FLAVOR}
 
 USES=		cpe python shebangfix
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
-PLIST_FILES=	man/man1/django-admin.1.gz
+PLIST_FILES=	share/man/man1/django-admin.1.gz
 PORTDOCS=	*
 
 SHEBANG_FILES=	django/conf/project_template/manage.py-tpl
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django[0-9][0-9]
 
 CPE_VENDOR=	djangoproject
 
 # Upstream archive contains files with UTF-8 names
 # EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 
 OPTIONS_DEFINE=	DOCS HTMLDOCS
 OPTIONS_GROUP=	DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 OPTIONS_DEFAULT=SQLITE
 HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 HTMLDOCS_IMPLIES=	DOCS
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 IGNORE=		requires Python 3.10 or later
 .endif
 
 post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${PREFIX}/man/man1
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"	* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
 
 post-install-HTMLDOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} tests/runtests.py --settings=test_sqlite
 
 .include <bsd.port.post.mk>
diff --git a/www/shellinabox/Makefile b/www/shellinabox/Makefile
index cb73c3c7fcea..096275d33299 100644
--- a/www/shellinabox/Makefile
+++ b/www/shellinabox/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	shellinabox
 PORTVERSION=	2.20
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	Publish command line shell through AJAX interface
 WWW=		https://github.com/shellinabox/shellinabox
 
 LICENSE=	GPLv2
 
 USES=	autoreconf cpe libtool ssl
 CPE_VENDOR=	${PORTNAME}_project
 
 OPTIONS_DEFINE=	CORES NOLOGIN
 CORES_DESC=	Patch shellinaboxd to enable core dumps
 NOLOGIN_DESC=	Login through ssh (not through login)
 
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	shellinaboxd
 USERS?=		shellinabox
 GROUPS?=	shellinabox
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 SUB_FILES=	pkg-deinstall
 SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
 
 CONFIGURE_ARGS=	--disable-runtime-loading --disable-pam \
 		CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
 
 NOLOGIN_CONFIGURE_ON=	--disable-login
 
 .include <bsd.port.options.mk>
 
 post-patch:
 .if ${PORT_OPTIONS:MCORES}
 	@${REINPLACE_CMD} \
 		-e 's|prctl(PR_SET_DUMPABLE,|// &|' \
 		-e 's|setrlimit(RLIMIT_CORE,|// &|' \
 			${WRKSRC}/shellinabox/shellinaboxd.c
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/shellinaboxd ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/www/shellinabox/pkg-plist b/www/shellinabox/pkg-plist
index d2fac3959140..37179f388f9d 100644
--- a/www/shellinabox/pkg-plist
+++ b/www/shellinabox/pkg-plist
@@ -1,3 +1,3 @@
 bin/shellinaboxd
-man/man1/shellinaboxd.1.gz
+share/man/man1/shellinaboxd.1.gz
 @dir(shellinabox,shellinabox,700) etc/shellinabox
diff --git a/www/unit/Makefile b/www/unit/Makefile
index e28eea21323d..108c399030ab 100644
--- a/www/unit/Makefile
+++ b/www/unit/Makefile
@@ -1,142 +1,142 @@
 PORTNAME=	unit
 PORTVERSION=	${UNIT_VERSION}
 PORTREVISION?=	1
 CATEGORIES=	www
 MASTER_SITES?=	https://unit.nginx.org/download/
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT?=	Dynamic web application server
 WWW=		https://unit.nginx.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES+=		compiler:c11 cpe
 
 CPE_VENDOR=	nginx
 CPE_PRODUCT=	unit
 
 OPTIONS_DEFINE?=	\
 	DEBUG \
 	IPV6 \
 	NJS \
 	SSL \
 	UNIXSOCK
 OPTIONS_DEFAULT?=	IPV6 PCRE2 SSL UNIXSOCK
 
 OPTIONS_RADIO+=		REGEX
 OPTIONS_RADIO_REGEX=	NOPCRE PCRE PCRE2
 
 DEBUG_DESC=	Enable debug logging
 REGEX_DESC=	Support regular expressions
 NJS_DESC=	Enable NGINX JavaScript
 NOPCRE_DESC=	No support for Regular Expressions
 PCRE_DESC=	Regular Expressions via devel/pcre
 PCRE2_DESC=	Regular Expressions via devel/pcre2
 SSL_DESC=	Enable SSL/TLS
 UNIXSOCK_DESC=	Enable unix sockets
 
 .include <bsd.port.options.mk>
 
 HAS_CONFIGURE=	yes
 
 UNIT_VARDIR?=	/var
 UNIT_DBDIR?=	${UNIT_VARDIR}/db/${PORTNAME}
 UNIT_LOGDIR?=	${UNIT_VARDIR}/log/${PORTNAME}
 UNIT_LOGFILE?=	${UNIT_LOGDIR}/${PORTNAME}.log
 UNIT_PIDFILE?=	${UNIT_RUNDIR}/${PORTNAME}.pid
 UNIT_RUNDIR?=	${UNIT_VARDIR}/run/unit
 UNIT_SOCK?=	${UNIT_RUNDIR}/control.unit.sock
 UNIT_TMPDIR?=	${UNIT_VARDIR}/tmp/unit
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--ld-opt="-L${LOCALBASE}/lib" \
 		--log=${UNIT_LOGFILE} \
 		--logdir=${UNIT_LOGDIR} \
 		--modulesdir=${PREFIX}/libexec/unit/modules \
 		--pid=${UNIT_PIDFILE} \
 		--runstatedir=${UNIT_RUNDIR} \
 		--statedir=${UNIT_DBDIR} \
 		--tmpdir=${UNIT_TMPDIR} \
 		--user=${WWWOWN} --group=${WWWGRP}
 
 USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
 
 ALL_TARGET=
 
 PLIST_DIRS?=	libexec/unit/modules \
 		libexec/unit
 PLIST_FILES?=	sbin/unitd \
 		share/man/man8/unitd.8.gz
 
 USE_RC_SUBR?=	unitd
 SUB_LIST=	PREFIX=${PREFIX} \
 		UNIT_PIDFILE=${UNIT_PIDFILE} \
 		UNIT_SOCK=${UNIT_SOCK} \
 		UNIT_TMPDIR=${UNIT_TMPDIR} \
 		WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP}
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--debug
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=--no-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MNJS}
 USES+=	pkgconfig
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libnjs.a:devel/libnjs
 CONFIGURE_ARGS+=--njs \
 	--cc-opt="-I${LOCALBASE}/include" \
 	--ld-opt="-L${LOCALBASE}/lib"
 .endif
 
 .if ${PORT_OPTIONS:MNOPCRE}
 CONFIGURE_ARGS+=--no-regex
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
 CONFIGURE_ARGS+=--no-pcre2
 LIB_DEPENDS+=	libpcre.so:devel/pcre
 .endif
 
 .if ${PORT_OPTIONS:MPCRE2}
 LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=--openssl
 USES+=		ssl
 .endif
 
 .if empty(PORT_OPTIONS:MUNIXSOCK)
 CONFIGURE_ARGS+=--no-unix-sockets
 .else
 CONFIGURE_ARGS+=--control=unix:${UNIT_SOCK}
 .endif
 
 .if defined(UNIT_MODNAME) && ${UNIT_MODNAME:Mperl*}
 # Fix build failure on clang >= 12
 CFLAGS+=	-Wno-compound-token-split-by-macro
 .endif
 
 .if !target(post-install)
 post-install:
 	${MKDIR} ${STAGEDIR}${UNIT_DBDIR}
 	${MKDIR} ${STAGEDIR}${UNIT_LOGDIR}
 	${MKDIR} ${STAGEDIR}${UNIT_RUNDIR}
 	${MKDIR} ${STAGEDIR}${UNIT_TMPDIR}
 	${ECHO_CMD} @dir ${UNIT_DBDIR} >> ${TMPPLIST}
 	${ECHO_CMD} @dir ${UNIT_LOGDIR} >> ${TMPPLIST}
 	${ECHO_CMD} @dir ${UNIT_RUNDIR} >> ${TMPPLIST}
 	${ECHO_CMD} @dir ${UNIT_TMPDIR} >> ${TMPPLIST}
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules
 	${INSTALL_MAN} ${WRKSRC}/build/share/man/man8/unitd.8 \
-		${STAGEDIR}${MAN8PREFIX}/share/man/man8
+		${STAGEDIR}${PREFIX}/share/man/man8
 .endif
 
 .include "../../www/unit/version.mk"
 .include <bsd.port.mk>
diff --git a/www/vger/Makefile b/www/vger/Makefile
index b89983c87ec2..76593fcaf763 100644
--- a/www/vger/Makefile
+++ b/www/vger/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	vger
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://tildegit.org/solene/vger/archive/
 DISTFILES=	${PORTVERSION}.tar.gz
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Simplistic and secure Gemini server
 WWW=		https://tildegit.org/solene/vger
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_CSTD=	c99
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-install:
 	${CP} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/share/man/man8/
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/gemini
 
 .include <bsd.port.mk>
diff --git a/www/vger/pkg-plist b/www/vger/pkg-plist
index 6b0628e90ddc..96a7ac3ca9c8 100644
--- a/www/vger/pkg-plist
+++ b/www/vger/pkg-plist
@@ -1,3 +1,3 @@
 bin/vger
-man/man8/vger.8.gz
+share/man/man8/vger.8.gz
 @dir %%ETCDIR%%/gemini
diff --git a/www/webbrowser/Makefile b/www/webbrowser/Makefile
index e91986574d7c..ef28ef54b7c9 100644
--- a/www/webbrowser/Makefile
+++ b/www/webbrowser/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	webbrowser
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://acadix.biz/Ports/distfiles/
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Wrapper for running the "best" available WEB browser
 WWW=		http://personalpages.tds.net/~jwbacon/Ports
 
 LICENSE=	BSD2CLAUSE
 
 NO_BUILD=	yes
 USES=		tar:xz
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/webbrowser ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/webbrowser.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/webbrowser.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
-PLIST_FILES=	bin/webbrowser man/man1/webbrowser.1.gz
+PLIST_FILES=	bin/webbrowser share/man/man1/webbrowser.1.gz
 
 .include <bsd.port.mk>
diff --git a/www/xh/Makefile b/www/xh/Makefile
index 25747d5f1a33..579e8b452043 100644
--- a/www/xh/Makefile
+++ b/www/xh/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	xh
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.18.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	Friendly and fast tool for sending HTTP requests
 WWW=		https://github.com/ducaale/xh
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libonig.so:devel/oniguruma
 
 USES=		cargo ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	ducaale
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=		COMPLETIONS DOCS MANPAGES
 OPTIONS_DEFAULT=	COMPLETIONS MANPAGES
 OPTIONS_SUB=		yes
 
 COMPLETIONS_DESC=		Install shell completions for bash, fish and zsh
 COMPLETIONS_PLIST_FILES=	share/bash-completion/completions/${PORTNAME} \
 				share/fish/vendor_completions.d/${PORTNAME}.fish \
 				share/zsh/site-functions/_${PORTNAME}
-MANPAGES_PLIST_FILES=		man/man1/${PORTNAME}.1.gz
+MANPAGES_PLIST_FILES=		share/man/man1/${PORTNAME}.1.gz
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-COMPLETIONS-on:
 	@${MV} ${WRKSRC}/completions/_${PORTNAME} ${WRKSRC}/completions/${PORTNAME}.zsh
 .for _shell in bash fish zsh
 	${INSTALL_DATA} ${WRKSRC}/completions/${PORTNAME}.${_shell}\
 		${STAGEDIR}${PREFIX}/${COMPLETIONS_PLIST_FILES:M*${_shell}*}
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${DOCSDIR}
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index a17962131494..24734567f182 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -1,353 +1,354 @@
 PORTNAME=	doublecmd
 PORTVERSION=	1.1.8
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Total Commander like file manager for the X Window System
 WWW=		https://doublecmd.sourceforge.io
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5 ${PORTNAME}-qt6
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt6
 qt6_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
 
 USES=		desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg
 DOS2UNIX_FILES=	components/multithreadprocs/mtpcpu.pas src/dmhelpmanager.pas
 USE_GITHUB=	yes
 GH_PROJECT=	doublecmd.github.io:help
 GH_TAGNAME=	1.0.10:help
 USE_GNOME=	cairo glib20
 USE_XORG=	x11
 
 LAZARUS_PROJECT_FILES=	components/chsdet/chsdet.lpk \
 			components/multithreadprocs/multithreadprocslaz.lpk \
 			components/kascrypt/kascrypt.lpk \
 			components/doublecmd/doublecmd_common.lpk \
 			components/Image32/Image32.lpk \
 			components/KASToolBar/kascomp.lpk \
 			components/viewer/viewerpackage.lpk \
 			components/gifanim/pkg_gifanim.lpk \
 			components/synunihighlighter/synuni.lpk \
 			components/virtualterminal/virtualterminal.lpk
 LAZBUILD_ARGS=		--pcp=${WRKSRC}/tmppcp -d
 
 MAKE_ENV+=	LDVER=ld.bfd # for DragonFly
 
 PLIST=		${WRKDIR}/pkg-plist
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DEBUG DOCS
 OPTIONS_DEFAULT=	DSX_LOCATE WCX_BASE64 WCX_CPIO WCX_DEB WCX_RPM WCX_UNRAR \
 			WCX_ZIP WDX_AUDIOINFO WDX_DEB WDX_RPM WDX_SCRIPTS \
 			WDX_TEXTLINE WFX_FTP WFX_SAMBA
 
 OPTIONS_GROUP=		DSX WCX WDX WFX WLX
 OPTIONS_GROUP_DSX=	DSX_LOCATE
 OPTIONS_GROUP_WCX=	WCX_BASE64 WCX_CPIO WCX_DEB WCX_RPM WCX_UNBZ2 WCX_UNRAR \
 			WCX_ZIP
 OPTIONS_GROUP_WDX=	WDX_AUDIOINFO WDX_DEB WDX_RPM WDX_SCRIPTS WDX_TEXTLINE
 OPTIONS_GROUP_WFX=	WFX_FTP WFX_SAMBA
 OPTIONS_GROUP_WLX=	WLX_MPLAYER
 
 DSX_DESC=		Search plugins
 DSX_LOCATE_DESC=	Support locate command
 
 WCX_BASE64_DESC=	BASE64 plugin support
 WCX_CPIO_DESC=	CPIO format support
 WCX_DEB_DESC=	Debian package archive support
 WCX_DESC=	Packer plugins to work with archives
 WCX_RPM_DESC=	Red Hat package archive support
 WCX_UNBZ2_DESC=	BZIP2 format support
 WCX_UNRAR_DESC=	RAR format support
 WCX_ZIP_DESC=	ZIP format support
 
 WDX_AUDIOINFO_DESC=	Information about audio files
 WDX_DEB_DESC=		Debian package file information
 WDX_DESC=		Plugins to display and search extended file attributes
 WDX_RPM_DESC=		Red Hat package file information
 WDX_SCRIPTS_DESC=	Add support to use custom Lua scripts
 WDX_TEXTLINE_DESC=	Show and replace single lines in text files
 
 WFX_DESC=	File system plugins
 WFX_FTP_DESC=	FTP protocol support
 WFX_SAMBA_DESC=	SMB protocol support
 
 WLX_DESC=		Internal viewer plugins
 WLX_MPLAYER_DESC=	Use MPlayer for multimedia files
 
 WCX_UNRAR_LIB_DEPENDS=		libunrar.so:archivers/libunrar
 WFX_SAMBA_USES=			samba:lib
 WLX_MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 LAZBUILD_ARGS+=	--bm="Debug"
 .endif
 
 .if ${PORT_OPTIONS:MWFX_FTP}
 LAZARUS_PROJECT_FILES+=	plugins/wfx/ftp/src/ftp.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_BASE64}
 LAZARUS_PROJECT_FILES+= plugins/wcx/base64/src/base64wcx.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_CPIO}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/cpio/src/cpio.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_DEB}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/deb/src/deb.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_UNBZ2}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/unbz2/src/unbz2.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_RPM}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/rpm/src/rpm.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_UNRAR}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/unrar/src/unrar.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_ZIP}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/zip/src/Zip.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWDX_AUDIOINFO}
 LAZARUS_PROJECT_FILES+=	plugins/wdx/audioinfo/src/AudioInfo.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWDX_RPM}
 LAZARUS_PROJECT_FILES+=	plugins/wdx/rpm_wdx/src/rpm_wdx.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWDX_DEB}
 LAZARUS_PROJECT_FILES+=	plugins/wdx/deb_wdx/src/deb_wdx.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWDX_TEXTLINE}
 LAZARUS_PROJECT_FILES+=	plugins/wdx/textline/src/TextLine.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWFX_SAMBA}
 LAZARUS_PROJECT_FILES+=	plugins/wfx/samba/src/samba.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWLX_MPLAYER}
 LAZARUS_PROJECT_FILES+=	plugins/wlx/WlxMplayer/src/wlxMplayer.lpi
 .endif
 
 .if ${PORT_OPTIONS:MDSX_LOCATE}
 LAZARUS_PROJECT_FILES+=	plugins/dsx/DSXLocate/src/DSXLocate.lpi
 .endif
 
 LAZARUS_PROJECT_FILES+=	src/doublecmd.lpi
 
 pre-patch:
 	${TR} '\r' '\n' < ${WRKSRC}/src/uGlobsPaths.pas > ${WRKSRC}/src/uGlobsPaths.pas.unix
 	${MV} ${WRKSRC}/src/uGlobsPaths.pas.unix ${WRKSRC}/src/uGlobsPaths.pas
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \
 		${WRKSRC}/src/uGlobsPaths.pas
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/plugins/wlx/WlxMplayer/src/wlxMplayer.lpr
 	@${REINPLACE_CMD} -e 's| Default="True"||g' \
 		-e 's|Name="NoDebug Full Optimizations"|Name="NoDebug Full Optimizations" Default="True"|g' \
 			${WRKSRC}/src/${PORTNAME}.lpi
 
 post-build:
 	@${RM} -r ${DOCSRC}/*/dev-help
 
 pre-install:
 	@${RM} ${PLIST}
 
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wcx" >> ${PLIST}
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wdx" >> ${PLIST}
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wfx" >> ${PLIST}
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wlx" >> ${PLIST}
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/dsx" >> ${PLIST}
 
 .if ${PORT_OPTIONS:MWCX_BASE64}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/base64/base64.wcx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWCX_CPIO}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/cpio/cpio.wcx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWCX_DEB}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/deb/deb.wcx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWCX_RPM}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/rpm/rpm.wcx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWCX_UNBZ2}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/unbz2/unbz2.wcx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWCX_UNRAR}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/unrar/unrar.wcx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWCX_ZIP}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/zip/zip.wcx" >> ${PLIST}
 .endif
 
 .if ${PORT_OPTIONS:MWDX_AUDIOINFO}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/audioinfo/audioinfo.wdx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWDX_RPM}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/rpm_wdx/rpm_wdx.wdx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWDX_DEB}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/deb_wdx/deb_wdx.wdx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWDX_SCRIPTS}
 	@cd ${WRKSRC}/plugins/wdx/scripts && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/plugins/wdx/scripts/|' >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWDX_TEXTLINE}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/textline/textline.wdx" >> ${PLIST}
 .endif
 
 .if ${PORT_OPTIONS:MWFX_FTP}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wfx/ftp/ftp.wfx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWFX_SAMBA}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wfx/samba/samba.wfx" >> ${PLIST}
 .endif
 
 .if ${PORT_OPTIONS:MWLX_MPLAYER}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wlx/wlxmplayer/wlxmplayer.wlx" >> ${PLIST}
 .endif
 
 .if ${PORT_OPTIONS:MDSX_LOCATE}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/dsx/dsxlocate/dsxlocate.dsx" >> ${PLIST}
 .endif
 
 .for FILE in %%DATADIR%%/pixmaps.txt %%DATADIR%%/multiarc.ini bin/doublecmd \
 	share/applications/doublecmd.desktop share/pixmaps/doublecmd.png \
 	share/icons/hicolor/scalable/apps/doublecmd.svg
 	@${ECHO_CMD} ${FILE} >> ${PLIST}
 .endfor
 
 	@cd ${WRKSRC}/language && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/language/|' >> ${PLIST}
 
 	@cd ${WRKSRC}/pixmaps && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/pixmaps/|' >> ${PLIST}
 
 	@cd ${WRKSRC}/sdk && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/sdk/|' >> ${PLIST}
 
-	@${ECHO_CMD} "man/man1/doublecmd.1.gz" >> ${PLIST}
+	@${ECHO_CMD} "share/man/man1/doublecmd.1.gz" >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wlx
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/dsx
 
 .if ${PORT_OPTIONS:MWCX_BASE64}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/base64
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/base64/base64.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/base64/
 .endif
 .if ${PORT_OPTIONS:MWCX_CPIO}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/cpio
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/cpio/cpio.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/cpio/
 .endif
 .if ${PORT_OPTIONS:MWCX_DEB}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/deb
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/deb/deb.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/deb/
 .endif
 .if ${PORT_OPTIONS:MWCX_RPM}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/rpm/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/rpm/rpm.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/rpm/
 .endif
 .if ${PORT_OPTIONS:MWCX_UNBZ2}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/unbz2/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/unbz2/lib/unbz2.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/unbz2/
 .endif
 .if ${PORT_OPTIONS:MWCX_UNRAR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/unrar/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/unrar/unrar.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/unrar/
 .endif
 .if ${PORT_OPTIONS:MWCX_ZIP}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/zip/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/zip/zip.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/zip/
 .endif
 
 .if ${PORT_OPTIONS:MWDX_AUDIOINFO}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/audioinfo/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/audioinfo/audioinfo.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/audioinfo/
 .endif
 .if ${PORT_OPTIONS:MWDX_RPM}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/rpm_wdx/rpm_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/
 .endif
 .if ${PORT_OPTIONS:MWDX_DEB}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/deb_wdx/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/deb_wdx/deb_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/deb_wdx/
 .endif
 .if ${PORT_OPTIONS:MWDX_SCRIPTS}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/
 	${INSTALL_DATA} ${WRKSRC}/plugins/wdx/scripts/* ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/
 .endif
 .if ${PORT_OPTIONS:MWDX_TEXTLINE}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/textline/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/textline/textline.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/textline/
 .endif
 
 .if ${PORT_OPTIONS:MWFX_FTP}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wfx/ftp/ftp.wfx ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/
 .endif
 .if ${PORT_OPTIONS:MWFX_SAMBA}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/samba/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wfx/samba/samba.wfx ${STAGEDIR}${DATADIR}/plugins/wfx/samba/
 .endif
 
 .if ${PORT_OPTIONS:MWLX_MPLAYER}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wlx/wlxmplayer/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wlx/WlxMplayer/lib/wlxmplayer.wlx ${STAGEDIR}${DATADIR}/plugins/wlx/wlxmplayer/
 .endif
 
 .if ${PORT_OPTIONS:MDSX_LOCATE}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/dsx/dsxlocate/
 	${INSTALL_LIB} ${WRKSRC}/plugins/dsx/DSXLocate/dsxlocate.dsx ${STAGEDIR}${DATADIR}/plugins/dsx/dsxlocate/
 .endif
 
 .for DIRE in language pixmaps sdk
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${DIRE}
 	@cd ${WRKSRC}/${DIRE} && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \;
 .endfor
 
 .for FILE in default/pixmaps.txt default/multiarc.ini
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR}
 .endfor
 
 	${INSTALL_DATA} ${WRKSRC}/doublecmd.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/mainicon/alt/dcfinal.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/doublecmd.svg
 
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/install/linux/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/
-	${INSTALL_MAN} ${WRKSRC}/install/linux/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/install/linux/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC_help} && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \;
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/aphelia/Makefile b/x11-wm/aphelia/Makefile
index 84dc9b806053..58b5392b49c9 100644
--- a/x11-wm/aphelia/Makefile
+++ b/x11-wm/aphelia/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	aphelia
 DISTVERSION=	g20190913
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Light, single-file, minimalist window manager for X11
 WWW=		https://github.com/vardy/aphelia
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	dmenu_run:x11/dmenu \
 		st:x11/sterm
 
 USES=		xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vardy
 GH_TAGNAME=	8b06c4c
 USE_XORG=	x11
 
 PLIST_FILES=	bin/aphelia \
-		man/man1/aphelia.1.gz
+		share/man/man1/aphelia.1.gz
 
 do-build:
 	${CC} ${CFLAGS} -I${LOCALBASE}/include ${WRKSRC}/aphelia.c \
 		${LDFLAGS} -L${LOCALBASE}/lib -lX11 -o ${WRKSRC}/aphelia
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/aphelia ${STAGEDIR}${PREFIX}/bin/aphelia
-	${INSTALL_MAN} ${WRKSRC}/aphelia.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/aphelia.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/mcwm/Makefile b/x11-wm/mcwm/Makefile
index be99748fb3ac..e85a217fb514 100644
--- a/x11-wm/mcwm/Makefile
+++ b/x11-wm/mcwm/Makefile
@@ -1,49 +1,51 @@
 PORTNAME=	mcwm
 PORTVERSION=	20130209
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://hack.org/mc/hacks/mcwm/
 
 MAINTAINER=	jakub_lach@mailplus.pl
 COMMENT=	Small window manager inspired by CTWM, evilwm, and tinywm
 WWW=		https://hack.org/mc/hacks/mcwm/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libxcb-util.so:x11/xcb-util \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-icccm.so:x11/xcb-util-wm
 
 USES=		tar:bzip2 xorg
 USE_XORG=	xcb
 
-PLIST_FILES=	bin/mcwm bin/hidden man/man1/mcwm.1.gz man/man1/hidden.1.gz
+PLIST_FILES=	bin/mcwm bin/hidden share/man/man1/mcwm.1.gz \
+		share/man/man1/hidden.1.gz
 PORTDOCS=	README NEWS
 
 OPTIONS_DEFINE=	DOCS
 
 pre-everything::
 	@${ECHO_MSG} "You can build mcwm with your own config.h using the MCWM_CONF knob:"
 	@${ECHO_MSG} "make MCWM_CONF=/path/to/mcwm/config.h install clean"
 
 post-extract:
 .if defined(MCWM_CONF)
 	@${ECHO_MSG} "creating config.h from ${MCWM_CONF}"
 	@${CP} ${MCWM_CONF} ${WRKSRC}/config.h
 .endif
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 	    ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man \
-		${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
+		${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
 	${INSTALL_PROGRAM} ${WRKSRC}/hidden ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/hidden.man \
-		${STAGEDIR}${MAN1PREFIX}/man/man1/hidden.1
+		${STAGEDIR}${PREFIX}/share/man/man1/hidden.1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-wm/sdorfehs/Makefile b/x11-wm/sdorfehs/Makefile
index cdfbf7ff5d50..749e58c093d8 100644
--- a/x11-wm/sdorfehs/Makefile
+++ b/x11-wm/sdorfehs/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	sdorfehs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Tiling window manager descended from ratpoison
 WWW=		https://github.com/jcs/sdorfehs
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	jcs
 USE_XORG=	x11 xft xrandr xres xtst
 
 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/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile
index 5cfebabc4786..a3d75fed9169 100644
--- a/x11-wm/spectrwm/Makefile
+++ b/x11-wm/spectrwm/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	spectrwm
 DISTVERSIONPREFIX=	SPECTRWM_
 DISTVERSION=	3_4_1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 
 MAINTAINER=	pyrus@bsdmail.com
 COMMENT=	Small, dynamic tiling window manager for X11
 WWW=		https://github.com/conformal/spectrwm
 
 LICENSE=	ISCL
 
 LIB_DEPENDS+=	libxcb-util.so:x11/xcb-util \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libxcb-keysyms.so:x11/xcb-util-keysyms
 RUN_DEPENDS+=	dmenu:x11/dmenu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	conformal
 
 OPTIONS_DEFINE=	EXAMPLES
 
 .include	<bsd.port.options.mk>
 
 USES=		compiler:c11 xorg
 USE_XORG=	x11 xcb xcursor xft xrandr xt
 
 USE_LDCONFIG=	yes
 CONFEXAMPLES=	spectrwm_cz.conf \
 		spectrwm_es.conf \
 		spectrwm_fr.conf \
 		spectrwm_fr_ch.conf \
 		spectrwm_se.conf \
 		spectrwm_us.conf
 
 SCRIPTEXAMPLES=	baraction.sh \
 		screenshot.sh
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/spectrwm.*
 
 do-build:
 	ln -sf ${WRKSRC}/linux/pledge.h ${WRKSRC}/pledge.h
 	${CC} ${CFLAGS} -Wall -Wextra -Wshadow -Werror -I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/freetype2 -I${WRKSRC}/freebsd \
 		-lutil -L${LOCALBASE}/lib -lX11 -lX11-xcb -lxcb -lxcb-icccm \
 		-lxcb-keysyms -lxcb-randr -lxcb-util -lxcb-xinput -lxcb-xtest \
 		-lXcursor -lXft -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \
 		-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
 	${CC} ${CFLAGS} -Wall -Wextra -Wshadow -Werror -I${LOCALBASE}/include \
 		-shared -fpic -DPIC -L${LOCALBASE}/lib -lX11 \
 		-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/spectrwm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/spectrwm.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_DATA} ${WRKSRC}/spectrwm.conf ${STAGEDIR}${PREFIX}/etc/spectrwm.conf.sample
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for file in ${CONFEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 .for file in ${SCRIPTEXAMPLES}
 	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-wm/spectrwm/pkg-plist b/x11-wm/spectrwm/pkg-plist
index 794235a11450..03b0dcc32607 100644
--- a/x11-wm/spectrwm/pkg-plist
+++ b/x11-wm/spectrwm/pkg-plist
@@ -1,12 +1,12 @@
 bin/spectrwm
 lib/libswmhack.so
-man/man1/spectrwm.1.gz
+share/man/man1/spectrwm.1.gz
 @sample etc/spectrwm.conf.sample
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/baraction.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/screenshot.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_cz.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_es.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_fr.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_fr_ch.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_se.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_us.conf
diff --git a/x11/j4-dmenu-desktop/Makefile b/x11/j4-dmenu-desktop/Makefile
index 464deee6e364..b2e0e8641943 100644
--- a/x11/j4-dmenu-desktop/Makefile
+++ b/x11/j4-dmenu-desktop/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	j4-dmenu-desktop
 DISTVERSIONPREFIX=	r
 DISTVERSION=	2.18
 CATEGORIES=	x11
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Fast desktop menu (i3-dmenu-desktop replacement)
 WWW=		https://github.com/enkore/j4-dmenu-desktop
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	enkore
 
 CMAKE_OFF=	WITH_TESTS
 
 PLIST_FILES=	bin/j4-dmenu-desktop \
 		share/man/man1/j4-dmenu-desktop.1.gz
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/j4-dmenu-desktop.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/j4-dmenu-desktop.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/srandrd/Makefile b/x11/srandrd/Makefile
index edcd11a448fb..073f6bd48eaf 100644
--- a/x11/srandrd/Makefile
+++ b/x11/srandrd/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	srandrd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0-15
 DISTVERSIONSUFFIX=	-gbb00996
 CATEGORIES=	x11
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Simple randr daemon
 WWW=		https://github.com/jceb/srandrd
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	a2x:textproc/asciidoc
 
 USES=		localbase:ldflags xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	jceb
 USE_XORG=	x11 xinerama xrandr
 
 MAKE_ARGS=	DISTDIR=${STAGEDIR} \
-		MANPREFIX=${STAGEDIR}${MAN1PREFIX}/share/man \
+		MANPREFIX=${STAGEDIR}${PREFIX}/share/man \
 		PREFIX=${PREFIX}
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index 66a30ae2e586..3e2ced0b0043 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	trayer
 PORTVERSION=	1.1.8
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Lightweight GTK2-based systray for UNIX desktop
 WWW=		https://github.com/sargon/trayer-srg
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		iconv gmake gnome pkgconfig xorg
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 pango
 USE_GITHUB=	yes
 USE_XORG=	x11 xmu
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}"
 
 GH_ACCOUNT=	sargon
 GH_PROJECT=	${PORTNAME}-srg
 
 PORTDOCS=	README CREDITS CHANGELOG
 
-PLIST_FILES=	bin/trayer man/man1/trayer.1.gz
+PLIST_FILES=	bin/trayer share/man/man1/trayer.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 6360f045a935..82f6075d74de 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,78 +1,78 @@
 PORTNAME?=	x3270
 PORTVERSION=	4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	x11 net
 MASTER_SITES=	http://x3270.bgp.nu/download/04.02/
 DISTFILES=	suite3270-${PORTVERSION}ga10-src.tgz
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT?=	3270 Terminal emulator
 WWW=		https://x3270.miraheze.org/wiki/Main_Page
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	tclsh:lang/tcl-wrapper
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		cpe iconv gmake readline shebangfix tcl
 
 # x3270 includes c3270
 CONFLICTS_INSTALL?=	c3270
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-unix
 .if defined(WITHOUT_OPENSSL)
 CONFIGURE_ARGS+=	--disable-tls
 .else
 USES+=	ssl
 .endif
 
 CPE_VENDOR=	paul_mattes
 
 WRKSRC=		${WRKDIR}/suite3270-${PORTVERSION}
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES DBCS
 
 DBCS_DESC=	EBCDIC double-byte character set support
 
 .include <bsd.port.options.mk>
 
 .if ! defined(C3270)
 BUILD_DEPENDS+=	bdftopcf:x11-fonts/bdftopcf \
 		mkfontscale:x11-fonts/mkfontscale
 USES+=	fonts xorg
 USE_XORG=	ice sm x11 xaw xext xmu xt xorgproto
 CONFIGURE_ARGS+=	--with-fontdir=${FONTSDIR} \
 			--with-x=${LOCALBASE}
 SHEBANG_FILES=	x3270/x3270a.in
 PLIST_SUB+=	X3270=""
 .else
 CONFIGURE_ARGS+=	--disable-x3270 \
 			--disable-x3270if
 PLIST_SUB+=	X3270="@comment "
 .endif
 
 # EBCDIC double-byte character set support is disabled by default
 .if ${PORT_OPTIONS:DBCS}
 CONFIGURE_ARGS+=	--enable-dbcs
 PLIST_SUB+=	DBCS=""
 .else
 PLIST_SUB+=	DBCS="@comment "
 .endif
 
 post-install:
 .for m in b3270 c3270 pr3287 s3270 tcl3270
-	@(cd ${WRKSRC} ; ${INSTALL_MAN} ${m}/${m}.man ${STAGEDIR}${MAN1PREFIX}/man/man1/${m}.1)
+	@(cd ${WRKSRC} ; ${INSTALL_MAN} ${m}/${m}.man ${STAGEDIR}${PREFIX}/share/man/man1/${m}.1)
 .endfor
 .if ! defined(C3270)
-	${INSTALL_MAN} ${WRKSRC}/x3270/x3270.man ${STAGEDIR}${MAN5PREFIX}/man/man1/x3270.1
-	${INSTALL_MAN} ${WRKSRC}/x3270if/x3270if.man ${STAGEDIR}${MAN5PREFIX}/man/man1/x3270if.1
+	${INSTALL_MAN} ${WRKSRC}/x3270/x3270.man ${STAGEDIR}${PREFIX}/share/man/man1/x3270.1
+	${INSTALL_MAN} ${WRKSRC}/x3270if/x3270if.man ${STAGEDIR}${PREFIX}/share/man/man1/x3270if.1
 .endif
-	${INSTALL_MAN} ${WRKSRC}/c3270/ibm_hosts.man ${STAGEDIR}${MAN5PREFIX}/man/man5/ibm_hosts.5
+	${INSTALL_MAN} ${WRKSRC}/c3270/ibm_hosts.man ${STAGEDIR}${PREFIX}/share/man/man5/ibm_hosts.5
 
 	@(cd ${WRKSRC}/x3270/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	@(cd ${WRKSRC}/x3270 && ${COPYTREE_SHARE} html ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/x11/x3270/pkg-plist b/x11/x3270/pkg-plist
index 1908f2f64497..42c965c0a394 100644
--- a/x11/x3270/pkg-plist
+++ b/x11/x3270/pkg-plist
@@ -1,35 +1,35 @@
 bin/b3270
 bin/c3270
 bin/pr3287
 bin/s3270
 bin/tcl3270
 %%X3270%%bin/x3270
 %%X3270%%bin/x3270a
 %%X3270%%bin/x3270if
 etc/x3270/ibm_hosts
 %%X3270%%%%FONTSDIR%%/3270-12.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270-12b.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270-20.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270-20b.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270b.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270gr.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270gt12.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270gt12b.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270gt16.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270gt16b.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270gt24.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270gt24b.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270gt32.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270gt32b.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270gt8.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270h.pcf.gz
 @comment %%FONTSDIR%%/fonts.dir
-man/man1/b3270.1.gz
-man/man1/c3270.1.gz
-man/man1/pr3287.1.gz
-man/man1/s3270.1.gz
-man/man1/tcl3270.1.gz
-%%X3270%%man/man1/x3270.1.gz
-%%X3270%%man/man1/x3270if.1.gz
-man/man5/ibm_hosts.5.gz
+share/man/man1/b3270.1.gz
+share/man/man1/c3270.1.gz
+share/man/man1/pr3287.1.gz
+share/man/man1/s3270.1.gz
+share/man/man1/tcl3270.1.gz
+%%X3270%%share/man/man1/x3270.1.gz
+%%X3270%%share/man/man1/x3270if.1.gz
+share/man/man5/ibm_hosts.5.gz
diff --git a/x11/xascii/Makefile b/x11/xascii/Makefile
index e4ffcfd7c7cd..39e0701ee3e3 100644
--- a/x11/xascii/Makefile
+++ b/x11/xascii/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	xascii
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://komquats.com/distfiles/ \
 		http://people.freebsd.org/~cy/distfiles/
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Display an ASCII table in decimal, octal, and hexadecimal
 
 USES=		imake xorg
 USE_XORG=	x11 xt xaw
 
 MAKE_ARGS=	PREFIX=${PREFIX}
 NO_WRKSUBDIR=	yes
-PLIST_FILES=	bin/xascii man/man1/xascii.1.gz
+PLIST_FILES=	bin/xascii share/man/man1/xascii.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/xascii/files/patch-Imakefile b/x11/xascii/files/patch-Imakefile
index 0fa99debeb9f..43f5ca497128 100644
--- a/x11/xascii/files/patch-Imakefile
+++ b/x11/xascii/files/patch-Imakefile
@@ -1,11 +1,11 @@
 --- Imakefile.orig	1991-08-05 12:32:29.000000000 -0700
 +++ Imakefile	2012-04-10 12:55:45.138341509 -0700
 @@ -1,5 +1,8 @@
  LOCAL_LIBRARIES = XawClientLibs
  
 +BINDIR = ${PREFIX}/bin
-+MANPATH = ${PREFIX}${MAN1PREFIX}/man
++MANPATH = ${PREFIX}/share/man
 +
  SRCS = xascii.c
  OBJS = xascii.o
  
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index 013498e2dc0b..cb9291a45935 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	xcut
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
 		http://acsys.anu.edu.au/~tpot/%SUBDIR%/
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Manipulate X cut buffers from the commandline
 WWW=		https://xcut.sourceforge.net/
 
 USES=		imake xorg
 USE_XORG=	x11
-PLIST_FILES=	bin/xcut man/man1/xcut.1.gz
+PLIST_FILES=	bin/xcut share/man/man1/xcut.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/xcut/files/patch-Imakefile b/x11/xcut/files/patch-Imakefile
index 1ac717af3517..7ce049f24903 100644
--- a/x11/xcut/files/patch-Imakefile
+++ b/x11/xcut/files/patch-Imakefile
@@ -1,13 +1,13 @@
 --- Imakefile.orig	Mon Sep 20 22:46:38 1999
 +++ Imakefile	Thu Sep 23 14:59:31 1999
 @@ -11,8 +11,8 @@
  
  XCOMM Set up for local environment
  
 -BINDIR=/usr/local/bin
 -MANPATH=/usr/local/man
-+BINDIR=${LOCALBASE}/bin
-+MANPATH=${LOCALBASE}${MAN1PREFIX}/man
++BINDIR=${PREFIX}/bin
++MANPATH=${PREFIX}/share/man
  MANSUFFIX=1
  
  XCOMM Build xcut and manpage
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index a8671da60ca6..627136192e71 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	xloadimage
 PORTVERSION=	4.1.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 graphics
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}.${VERSION}
 DISTFILES=	${DISTNAME:S/./_/}.orig${EXTRACT_SUFX} \
 		${DISTNAME:S/./_/}-${REVISION}.debian.tar.xz
 
 MAINTAINER=	ak@FreeBSD.org
 COMMENT=	X11 Image Loading Utility
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 CONFLICTS_INSTALL=	xli
 
 EXTRA_PATCHES=	${WRKDIR}/debian/patches/*.patch
 IGNORE_PATCHES=	07_SYSPATHFILE.patch 24_libtiff5.patch \
 		25_hardening-flags.patch 26_uufilter-implicit-declaration.patch \
 		30_libtiff5.patch 31_reproducible-build.patch
 
 PATCH_STRIP=	-p1
 VERSION=	${PORTVERSION:R}
 REVISION=	${PORTVERSION:E}
 
 USES=		jpeg xorg
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
 # Temporary fix, waiting for k&r cleanup patch from debian
 CFLAGS+=	-Wno-int-conversion
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 pre-patch:
 	@${RM} ${IGNORE_PATCHES:S,^,${WRKDIR}/debian/patches/,}
 
 post-patch:
 	@${CHMOD} a+rx ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|TIFFHeader|TIFFHeaderClassic|g' \
 		${WRKSRC}/tiff.c
 	@${REINPLACE_CMD} -e \
 		's:/etc/X11/Xloadimage:${PREFIX}/etc/xloadimagerc: ; \
 		 s:/usr/lib/xloadimagerc:${PREFIX}/etc/xloadimagerc: ; \
 		 s:/usr/include/X11/bitmaps:${PREFIX}/include/X11/bitmaps:' \
 		${WRKSRC}/xloadimage.man
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xloadimage ${STAGEDIR}${PREFIX}/bin
 	@(cd ${STAGEDIR}${PREFIX}/bin && \
 		${LN} -sf xloadimage xsetbg && \
 		${LN} -sf xloadimage xview )
 	${INSTALL_PROGRAM} ${WRKSRC}/uufilter ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/uufilter.man ${STAGEDIR}${MAN1PREFIX}/man/man1/uufilter.1
-	${INSTALL_MAN} ${WRKSRC}/xloadimage.man ${STAGEDIR}${MAN1PREFIX}/man/man1/xloadimage.1
-	@(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && \
+	${INSTALL_MAN} ${WRKSRC}/uufilter.man ${STAGEDIR}${PREFIX}/share/man/man1/uufilter.1
+	${INSTALL_MAN} ${WRKSRC}/xloadimage.man ${STAGEDIR}${PREFIX}/share/man/man1/xloadimage.1
+	@(cd ${STAGEDIR}${PREFIX}/share/man/man1 && \
 		${LN} -sf xloadimage.1 xsetbg.1 && \
 		${LN} -sf xloadimage.1 xview.1 )
 	${INSTALL_DATA} ${WRKSRC}/xloadimagerc ${STAGEDIR}${PREFIX}/etc/xloadimagerc.sample
 
 .include <bsd.port.mk>
diff --git a/x11/xloadimage/pkg-plist b/x11/xloadimage/pkg-plist
index 67b5e2ec7150..df066c0b1023 100644
--- a/x11/xloadimage/pkg-plist
+++ b/x11/xloadimage/pkg-plist
@@ -1,9 +1,9 @@
 bin/uufilter
 bin/xloadimage
 bin/xsetbg
 bin/xview
-man/man1/uufilter.1.gz
-man/man1/xloadimage.1.gz
-man/man1/xsetbg.1.gz
-man/man1/xview.1.gz
+share/man/man1/uufilter.1.gz
+share/man/man1/xloadimage.1.gz
+share/man/man1/xsetbg.1.gz
+share/man/man1/xview.1.gz
 @sample etc/xloadimagerc.sample
diff --git a/x11/xsel-conrad/Makefile b/x11/xsel-conrad/Makefile
index 1682ecdd3d30..e44b30d09b94 100644
--- a/x11/xsel-conrad/Makefile
+++ b/x11/xsel-conrad/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	xsel
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.vergenet.net/~conrad/software/xsel/download/
 PKGNAMESUFFIX=	-conrad
 
 MAINTAINER=	code@apotheon.net
 COMMENT=	Access X selection from command line
 WWW=		https://www.vergenet.net/~conrad/software/xsel/
 
 LICENSE=	xsel-conrad
 LICENSE_GROUPS=	COPYFREE
 LICENSE_NAME=	xsel-conrad license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 CONFLICTS_INSTALL=	xsel
 
 USES=		autoreconf localbase xorg
 USE_XORG=	x11 xt
 GNU_CONFIGURE=	yes
-PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
+PLIST_FILES=	bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz
 PORTDOCS=	ChangeLog README
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
 
 do-install-DOCS-on:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/x11/xsettingsd/Makefile b/x11/xsettingsd/Makefile
index 0f5ee6d4f670..7b8659d54c97 100644
--- a/x11/xsettingsd/Makefile
+++ b/x11/xsettingsd/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	xsettingsd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.0-2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g1b2bcca
 CATEGORIES=	x11
 
 MAINTAINER=	aou@eecs.berkeley.edu
 COMMENT=	Daemon that implements the XSETTINGS specification
 WWW=		https://github.com/derat/xsettingsd
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lang pkgconfig scons xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	derat
 USE_XORG=	x11
 
 PLIST_FILES=	bin/dump_xsettings \
 		bin/xsettingsd \
-		man/man1/dump_xsettings.1.gz \
-		man/man1/xsettingsd.1.gz
+		share/man/man1/dump_xsettings.1.gz \
+		share/man/man1/xsettingsd.1.gz
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 pre-configure:
 	${REINPLACE_CMD} -e 's|-Wno-narrowing||' ${WRKSRC}/SConstruct
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dump_xsettings ${WRKSRC}/xsettingsd \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/dump_xsettings.1 ${WRKSRC}/xsettingsd.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.post.mk>