diff --git a/devel/cvsps-devel/Makefile b/devel/cvsps-devel/Makefile
index 9a74b7bbd063..37fa383e45a3 100644
--- a/devel/cvsps-devel/Makefile
+++ b/devel/cvsps-devel/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	cvsps
 DISTVERSION=	2.2b1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/
 PKGNAMESUFFIX?=	-devel
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Create patchset information from CVS
 WWW=		https://cvsps.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	cvsps
 
 USES=		gmake
 ALL_TARGET=	cvsps
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 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}/man/man1/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile
index ffeb4ef99aa1..c0deb03094c6 100644
--- a/devel/cvsps/Makefile
+++ b/devel/cvsps/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	cvsps
 PORTVERSION=	2.1
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Create patchset information from CVS
 WWW=		https://cvsps.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	cvsps-devel
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 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}/man/man1/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/devel/git/Makefile b/devel/git/Makefile
index fb4985d03cda..e4d923a69286 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,361 +1,361 @@
 PORTNAME=	git
 DISTVERSION=	2.43.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX}
 # We manually extract the htmldocs.
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT?=	Distributed source code management tool ${COMMENT_${FLAVOR}}
 WWW=		https://git-scm.com/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 SUBPORT?=	core
 
 .if ${SUBPORT} != core
 PKGNAMESUFFIX=	-${SUBPORT}
 .endif
 
 .if ${SUBPORT} == core
 FLAVORS=	default lite tiny
 default_CONFLICTS_INSTALL=	git-lite git-tiny
 lite_CONFLICTS_INSTALL=		git git-tiny
 lite_DESCR=			${.CURDIR}/pkg-descr-lite
 lite_PKGNAMESUFFIX=		-lite
 tiny_CONFLICTS_INSTALL=		git git-lite
 tiny_DESCR=			${.CURDIR}/pkg-descr-tiny
 tiny_PKGNAMESUFFIX=		-tiny
 .endif
 
 USES=		autoreconf cpe gmake iconv shebangfix tar:xz
 CPE_VENDOR=	git-scm
 
 .if ${SUBPORT} == core
 USES+=		ssl
 COMMENT_lite=	(lite flavor)
 COMMENT_tiny=	(tiny flavor)
 
 USERS=		git_daemon
 GROUPS=		git_daemon
 .endif
 
 SUB_FILES=	pkg-message gitweb.conf
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-isystem${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS=	DEVELOPER= NO_TCLTK=yes
 MAKE_ENV+=	V=1
 .if ${SUBPORT} == core
 USE_RC_SUBR=	git_daemon
 .endif
 SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
 		t/*/*/pre t/*/*/post t/Git-SVN/Utils/*.t \
 		git-p4.py \
 		contrib/hg-to-git/hg-to-git.py \
 		contrib/hooks/update-paranoid \
 		contrib/fast-import/import-zips.py \
 		contrib/remote-helpers/git-remote-bzr \
 		contrib/remote-helpers/git-remote-hg \
 		contrib/credential/netrc/git-credential-netrc.perl \
 		contrib/buildsystems/generate contrib/contacts/git-contacts \
 		templates/hooks--fsmonitor-watchman.sample
 TEST_TARGET=	test
 
 CONFIGURE_ARGS=	--enable-pthreads=-pthread ac_cv_header_libcharset_h=no
 
 .if ${SUBPORT} == core
 
 OPTIONS_DEFINE=	CONTRIB CURL GITWEB HTMLDOCS ICONV NLS PCRE2 PERL SEND_EMAIL \
 		SUBTREE
 OPTIONS_DEFAULT=CONTRIB CURL GITWEB ICONV PCRE2 PERL SEND_EMAIL SUBTREE
 
 . if ${FLAVOR:U} == lite
 OPTIONS_EXCLUDE+=	GITWEB CONTRIB PERL
 . elif ${FLAVOR:U} == tiny
 OPTIONS_EXCLUDE:=	${OPTIONS_DEFINE:NCURL}
 OPTIONS_SLAVE=		CURL
 . endif
 
 OPTIONS_SUB=	yes
 
 . if !empty(FLAVOR) && ${FLAVOR:U} != default
 OPTIONS_FILE=		${PORT_DBDIR}/${OPTIONS_NAME}/${FLAVOR}-options
 . endif
 
 CONTRIB_DESC=	Install contributed scripts
 CURL_DESC=	Install curl support (provides HTTPS transport)
 GITWEB_DESC=	Install gitweb
 HTMLDOCS_DESC=	Install additional documentation
 PCRE2_DESC=	Use Perl Compatible Regular Expressions (v2)
 SEND_EMAIL_DESC=Enable the git-send-email(1) script
 SUBTREE_DESC=	Install git-subtree
 
 NLS_USES=		gettext
 NLS_MAKE_ARGS_OFF=	NO_GETTEXT=yes
 
 PERL_USES=		perl5
 PERL_CONFIGURE_WITH=	perl=${PERL}
 PERL_BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error
 PERL_RUN_DEPENDS=	p5-Error>=0:lang/p5-Error
 PERL_MAKE_ARGS_OFF=	NO_PERL=1
 
 GITWEB_IMPLIES=		PERL
 GITWEB_RUN_DEPENDS=	p5-CGI>=0:www/p5-CGI
 GITWEB_MAKE_ARGS_OFF=	NO_GITWEB=1
 
 PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PCRE2_CONFIGURE_WITH=	libpcre
 
 SEND_EMAIL_IMPLIES=	PERL
 SEND_EMAIL_RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
 			p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 
 ICONV_MAKE_ARGS_OFF=	NO_ICONV=1
 
 CURL_MAKE_ENV=		CURLDIR=${LOCALBASE}
 CURL_BUILD_DEPENDS=	curl:ftp/curl
 CURL_RUN_DEPENDS=	curl:ftp/curl
 CURL_LIB_DEPENDS=	libexpat.so:textproc/expat2
 CURL_MAKE_ARGS_OFF=	NO_CURL=1 NO_EXPAT=1
 
 HTMLDOCS_DISTFILES=	${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX}
 
 SUBTREE_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor\
 			xmlto:textproc/xmlto
 
 .else
 
 NO_ARCH=	yes
 MAKE_ENV+=	V=1
 MAKE_ARGS=	NO_GETTEXT=yes
 . if ${SUBPORT} != gui
 MAKE_ARGS+=	NO_TCLTK=yes
 . endif
 
 RUN_DEPENDS+=	git=${PKGVERSION}:devel/git
 
 . if ${SUBPORT} == cvs
 RUN_DEPENDS+=	cvsps:devel/cvsps
 . elif ${SUBPORT} == gui
 USES+=		tk
 MAKE_ARGS+=	TCL_PATH=${TCLSH} TCLTK_PATH=${WISH}
 . elif ${SUBPORT} == svn
 RUN_DEPENDS+=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 .  if ${WITH_SUBVERSION_VER:U} == LTS
 RUN_DEPENDS+=	p5-subversion-lts>=0:devel/p5-subversion
 .  else
 RUN_DEPENDS+=	p5-subversion>=0:devel/p5-subversion
 .  endif
 . endif
 .endif
 
 .include <bsd.port.options.mk>
 
 # This is intentionally not exposed as an option.
 .if defined(STRIP) && ${STRIP} != ""
 ALL_TARGET=	all strip
 .endif
 
 .if ${SUBPORT} == p4 || ${PORT_OPTIONS:MCONTRIB}
 USES+=		python
 CONFIGURE_ARGS+=	--with-python=${PYTHON_CMD}
 .else
 CONFIGURE_ARGS+=	--without-python
 .endif
 
 .if ${SUBPORT} != gui
 RMMAN1+=	git-citool.1 \
 		git-gui.1 \
 		gitk.1
 .endif
 
 .if ${SUBPORT} != p4
 RMMAN1+=	git-p4.1
 .endif
 
 .if ${SUBPORT} != svn
 RMMAN1+=	git-svn.1
 .endif
 
 .if ${SUBPORT} != cvs
 RMMAN1+=	git-cvsimport.1 \
 		git-cvsexportcommit.1 \
 		git-cvsserver.1
 RMMAN7+=	gitcvs-migration.7
 .endif
 
 post-extract-HTMLDOCS-on:
 	@${MKDIR} ${WRKDIR}/htmldocs
 	@cd ${WRKDIR}/htmldocs && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS}
 
 post-patch:
 .for FILE in ${RMMAN1}
 	@${RM} ${WRKDIR}/man1/${FILE}
 .endfor
 .for FILE in ${RMMAN7}
 	@${RM} ${WRKDIR}/man7/${FILE}
 .endfor
 	@${REINPLACE_CMD} -e "s,%%SITE_PERL%%,${SITE_PERL},g" ${WRKSRC}/Makefile
 .if ${SUBPORT} != cvs
 	@${REINPLACE_CMD} -e '/git-cvsexportcommit.perl/d; \
 		/git-cvsimport.perl/d; \
 		/git-cvsserver.perl/d; \
 		s/git-cvsserver//' \
 		${WRKSRC}/Makefile
 .endif
 .if ${SUBPORT} != p4
 	@${REINPLACE_CMD} -e '/^SCRIPT_PYTHON += git-p4.py$$/d' \
 		${WRKSRC}/Makefile
 .endif
 .if ${SUBPORT} != svn
 	@${REINPLACE_CMD} -e '/git-svn.perl/d' ${WRKSRC}/Makefile
 .endif
 .if ${SUBPORT} == gui
 	@${REINPLACE_CMD} -e "/exec wish/s,wish,${WISH}," \
 		${WRKSRC}/gitk-git/gitk \
 		${WRKSRC}/git-gui/git-gui--askpass
 .endif
 
 post-patch-CONTRIB-on:
 	@${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," \
 		${WRKSRC}/contrib/diff-highlight/Makefile
 
 post-patch-GITWEB-on:
 	@${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," \
 		${WRKSRC}/t/lib-gitweb.sh
 
 .if ${SUBPORT} == p4 || ${PORT_OPTIONS:MCONTRIB}
 post-build:
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 .endif
 
 .if ${SUBPORT} == core
 post-build-CONTRIB-on:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/contrib/diff-highlight
 	${RM} ${WRKSRC}/contrib/diff-highlight/shebang.perl
 
 post-install:
 	(cd ${WRKDIR}/man1/ && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man1)
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/man/man1)
 	(cd ${WRKDIR}/man5/ && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man5)
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/man/man5)
 	(cd ${WRKDIR}/man7/ && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man7)
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/man/man7)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git
 	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
 		${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/
 	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git-blame.el \
 		${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/scalar \
 		${STAGEDIR}${PREFIX}/libexec/git-core/scalar
 
 post-install-HTMLDOCS-on:
 	# Manually remove the index.html symlink before installing, and then
 	# recreate it after. This is necessary because the distfile is
 	# extracted with --no-same-owner. If the distfile is extracted as a
 	# non-root user then the symlink will have the incorrect owner.
 	${RM} ${WRKDIR}/htmldocs/index.html
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html
 
 post-install-SUBTREE-on:
 	cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_FLAGS} Makefile USE_ASCIIDOCTOR=1 \
 		${MAKE_ARGS} install install-doc
 
 post-install-CONTRIB-on:
 	@${ECHO_MSG} "===> Installing contributed scripts"
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/git-core/contrib
 	${RM} ${WRKSRC}/contrib/credential/netrc/test.netrc.gpg
 	${CP} -R ${WRKSRC}/contrib/* ${STAGEDIR}${PREFIX}/share/git-core/contrib
 
 post-install-GITWEB-on:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/gitweb.conf \
 		${STAGEDIR}${ETCDIR}/gitweb.conf.sample
 
 .elif ${SUBPORT} == gui
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/git-core \
 		 ${STAGEDIR}${PREFIX}/share/git-gui/lib/msgs \
 		 ${STAGEDIR}${PREFIX}/share/gitk/lib/msgs
 	${INSTALL_SCRIPT} ${WRKSRC}/gitk-git/gitk \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/git-gui/git-gui \
 		${STAGEDIR}${PREFIX}/libexec/git-core/
 	${LN} ${STAGEDIR}${PREFIX}/libexec/git-core/git-gui \
 		${STAGEDIR}${PREFIX}/libexec/git-core/git-citool
 	${INSTALL_SCRIPT} ${WRKSRC}/git-gui/git-gui--askpass \
 		${STAGEDIR}${PREFIX}/libexec/git-core/
 	${INSTALL_DATA} ${WRKSRC}/git-gui/lib/tclIndex \
 		${STAGEDIR}${PREFIX}/share/git-gui/lib/
 	${INSTALL_DATA} ${WRKSRC}/git-gui/lib/*.ico \
 		${STAGEDIR}${PREFIX}/share/git-gui/lib/
 	${INSTALL_DATA} ${WRKSRC}/git-gui/lib/*.js \
 		${STAGEDIR}${PREFIX}/share/git-gui/lib/
 	${INSTALL_DATA} ${WRKSRC}/git-gui/lib/*.tcl \
 		${STAGEDIR}${PREFIX}/share/git-gui/lib/
 	${INSTALL_DATA} ${WRKSRC}/git-gui/po/*.msg \
 		${STAGEDIR}${PREFIX}/share/git-gui/lib/msgs/
 	${INSTALL_DATA} ${WRKSRC}/gitk-git/po/*.msg \
 		${STAGEDIR}${PREFIX}/share/gitk/lib/msgs/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-citool.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-gui.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_DATA} ${WRKDIR}/man1/gitk.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/man/man1/
 
 .elif ${SUBPORT} == cvs
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/git-core
 	${INSTALL_SCRIPT} ${WRKSRC}/git-cvsserver ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/git-cvsexportcommit \
 		${STAGEDIR}${PREFIX}/libexec/git-core/
 	${INSTALL_SCRIPT} ${WRKSRC}/git-cvsimport \
 		${STAGEDIR}${PREFIX}/libexec/git-core/
 	${INSTALL_SCRIPT} ${WRKSRC}/git-cvsserver \
 		${STAGEDIR}${PREFIX}/libexec/git-core/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-cvsimport.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-cvsexportcommit.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-cvsserver.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_DATA} ${WRKDIR}/man7/gitcvs-migration.7 \
-		${STAGEDIR}${MANPREFIX}/man/man7/
+		${STAGEDIR}${PREFIX}/man/man7/
 
 .elif ${SUBPORT} == p4
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/git-core
 	${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py \
 		${STAGEDIR}${PREFIX}/libexec/git-core/git-p4
 	${INSTALL_DATA} ${WRKDIR}/man1/git-p4.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/man/man1/
 
 .elif ${SUBPORT} == svn
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/git-core
 	${INSTALL_SCRIPT} ${WRKSRC}/git-svn \
 		${STAGEDIR}${PREFIX}/libexec/git-core/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-svn.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/man/man1/
 .endif
 
 .include <bsd.port.mk>
diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index 8bc53ac840a2..9fdf89e78cdd 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -1,116 +1,116 @@
 PORTNAME=	bitlbee
 PORTVERSION=	3.6
 PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		LOCAL/brix
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	IRC to other chat networks gateway
 WWW=		https://www.bitlbee.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xmlto:textproc/xmlto \
 		xsltproc:textproc/libxslt
 
 USES=		cpe gettext-runtime gmake gnome pkgconfig
 
 SUB_FILES=	pkg-message
 PORTDOCS=	AUTHORS CHANGES CREDITS FAQ README
 PORTEXAMPLES=	bitlbee.conf motd.txt
 
 HAS_CONFIGURE=	yes
 USE_RC_SUBR=	bitlbee
 USE_GNOME=	glib20
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES LDAP OTR PAM
 
 OPTIONS_SINGLE=		EVENTS SSL
 OPTIONS_SINGLE_EVENTS=	GLIB LIBEVENT
 OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS NSS
 
 OPTIONS_MULTI=		PROTO
 OPTIONS_MULTI_PROTO=	LIBPURPLE JABBER MSN OSCAR TWITTER
 
 LIBPURPLE_PREVENTS=	JABBER MSN OSCAR TWITTER
 LIBPURPLE_PREVENTS_MSG=	If libpurple is enabled, all native protocols must be disabled
 
 GLIB_DESC=		Use glib as event handler
 LIBEVENT_BROKEN=	bitlbee w/ libevent fails to start as daemon or fork
 LIBEVENT_DESC=		Use libevent as event handler
 LIBPURPLE_DESC=		Use libpurple for protocol support
 MSN_DESC=		Microsoft Messenger support
 OSCAR_DESC=		OSCAR (ICQ) support
 OTR_DESC=		Off-the-Record Messaging support
 TWITTER_DESC=		Twitter support
 
 OPTIONS_DEFAULT=	GLIB GNUTLS JABBER OSCAR OTR TWITTER
 
 CONFIGURE_ARGS=		--config=/var/db/bitlbee \
 			--pcdir=${PREFIX}/libdata/pkgconfig \
 			--prefix=${PREFIX} \
-			--mandir=${MANPREFIX}/man \
+			--mandir=${PREFIX}/man \
 			--strip=1 \
 			--yahoo=0
 
 DEBUG_CONFIGURE_ON=	--debug=1
 DOCS_USES=		python:build
 DOCS_CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 GLIB_CONFIGURE_ON=	--events=glib
 GNUTLS_CONFIGURE_ON=	--ssl=gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
 JABBER_CONFIGURE_OFF=	--jabber=0
 LDAP_CONFIGURE_ON=	--ldap=1
 LDAP_USES=		ldap
 LIBEVENT_CONFIGURE_ON=	--events=libevent --libevent=${LOCALBASE}
 LIBEVENT_LIB_DEPENDS=	libevent.so:devel/libevent
 LIBPURPLE_CONFIGURE_ON=	--purple=1
 LIBPURPLE_LIB_DEPENDS=	libpurple.so:net-im/libpurple
 MSN_CONFIGURE_OFF=	--msn=0
 NSS_CONFIGURE_ON=	--ssl=nss
 NSS_LIB_DEPENDS=	libnss3.so:security/nss \
 			libnspr4.so:devel/nspr \
 			libplc4.so:devel/nspr \
 			libplds4.so:devel/nspr
 OPENSSL_CONFIGURE_ON=	--ssl=openssl
 OPENSSL_USES=		ssl
 OSCAR_CONFIGURE_OFF=	--oscar=0
 OTR_CONFIGURE_ON=	--otr=1
 OTR_LIB_DEPENDS=	libotr.so.5:security/libotr \
 			libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
 PAM_CONFIGURE_ON=	--pam=1
 TWITTER_CONFIGURE_OFF=	--twitter=0
 
 USERS=		bitlbee
 GROUPS=		bitlbee
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^install:/ s/$$/ install-dev/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s|^\(EFLAGS=.*\)|\1 ${LDFLAGS}|" \
 			  -e "/include.*ldap.h/ s,-E,-I${LOCALBASE}/include -E," \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s:/etc/bitlbee/motd.txt:${ETCDIR}/motd.txt:" \
 		-e "s:/var/lib/bitlbee:/var/db/bitlbee:" \
 		${WRKSRC}/bitlbee.conf
 	@${REINPLACE_CMD} -e "s:/var/lib/bitlbee:/var/db/bitlbee:" \
 		${WRKSRC}/doc/bitlbee.8
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/doc/@} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/ondir/Makefile b/misc/ondir/Makefile
index 7dca1bc82de7..c6a138f6049b 100644
--- a/misc/ondir/Makefile
+++ b/misc/ondir/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	ondir
 PORTVERSION=	0.2.4
 PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://swapoff.org/files/${PORTNAME}/
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Automatically executes scripts as you traverse directories
 WWW=		https://swapoff.org/ondir.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ALL_TARGET=	${PORTNAME}
 MAKE_ARGS=	PREFIX="${PREFIX}" \
 		CC="${CC}" LD="${CC}" \
 		CFLAGS="${CFLAGS} -DVERSION=\\\"${PORTVERSION}\\\" -DGLOBAL_CONF=\\\"${PREFIX}/etc/ondirrc\\\"" \
 		LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/choparp/Makefile b/net-mgmt/choparp/Makefile
index 89a760c4686e..7e383480d0db 100644
--- a/net-mgmt/choparp/Makefile
+++ b/net-mgmt/choparp/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	choparp
 PORTVERSION=	20150613
 DISTVERSIONPREFIX=	release/
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Simple proxy arp daemon
 WWW=		https://github.com/quinot/choparp
 
 LICENSE=	BSD3CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	quinot
 USE_RC_SUBR=	choparp
 LDFLAGS+=	-lpcap
 
 PLIST_FILES=	sbin/choparp man/man8/choparp.8.gz
 
 do-build:
 	( cd ${WRKSRC}/src && \
 		${CC} ${CFLAGS} ${LDFLAGS} -o ${PORTNAME} ${PORTNAME}.c )
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/src/${PORTNAME}.8 \
-		${STAGEDIR}${MAN8PREFIX}/man/man8
+		${STAGEDIR}${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index f8f726ddd20a..c7331f1465a5 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	tcpdump
 PORTVERSION=	4.99.4
 PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcpdump.org/release/
 
 PATCH_SITES=	https://github.com/the-tcpdump-group/tcpdump/commit/
 PATCHFILES=	5c1ecd8c.patch:-p1
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Ubiquitous network traffic analysis tool
 WWW=		https://www.tcpdump.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpcap.so.1:net/libpcap
 
 USES=		cpe gmake
 
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	sbin/tcpdump \
 		man/man1/tcpdump.1.gz
 
 UNPRIV_USER?=	tcpdump
 CHROOTDIR?=	/var/run/tcpdump
 
 OPTIONS_DEFINE=	CRYPTO SMB SMI USER CHROOT
 OPTIONS_DEFAULT=	CRYPTO SMB SMI
 
 CHROOT_DESC=	Chroot to /var/run/tcpdump (set CHROOTDIR to change)
 CRYPTO_DESC=	Support IPSEC and TCPMD5
 # This one is intentionally worded this way because the default
 # description implies that tcpdump would not capture SMB, which
 # is not true. It will just not print it if this option is off.
 SMB_DESC=	Support printing SMB information
 SMI_DESC=	Allow MIBs to be loaded on the fly
 USER_DESC=	Drop privileges to dedicated user
 
 CHROOT_CONFIGURE_ON=	--with-chroot=${CHROOTDIR}
 CRYPTO_USES=		ssl
 CRYPTO_CONFIGURE_WITH=	crypto
 SMB_CONFIGURE_ENABLE=	smb
 SMI_LIB_DEPENDS=	libsmi.so:net-mgmt/libsmi
 SMI_CONFIGURE_WITH=	smi
 USER_CONFIGURE_ON=	--with-user=${UNPRIV_USER}
 USER_VARS=		USERS=${UNPRIV_USER} GROUPS=${UNPRIV_USER}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,sys/capability.h,sys/capsicum.h,' \
 		${WRKSRC}/tcpdump.c
 
 post-configure:
 	@${REINPLACE_CMD} -e "s,\./\.\./${LIBPCAP_FORCE_VER}/libpcap\.a,${LOCALBASE}/lib/libpcap.so.1," \
 		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcpdump ${STAGEDIR}/${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/tcpdump.1 ${STAGEDIR}/${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tcpdump.1 ${STAGEDIR}/${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/net/wmnd/Makefile b/net/wmnd/Makefile
index d41fbb9c79c1..3a4b163a2f29 100644
--- a/net/wmnd/Makefile
+++ b/net/wmnd/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	wmnd
 PORTVERSION=	0.4.18
 CATEGORIES=	net
 MASTER_SITES=	http://www.thregr.org/~wavexx/software/wmnd/releases/
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Improved network monitoring dock app (with tons of features)
 WWW=		https://www.thregr.org/~wavexx/software/wmnd/
 
 LICENSE=	GPLv2
 
 USES=		gmake xorg
 
 OPTIONS_DEFINE=	EXAMPLES
 
 USE_XORG=	ice sm x11 xext xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dummy-driver --enable-drivers=freebsd_sysctl
 
 PORTEXAMPLES=	wmndrc
 PLIST_FILES=	bin/wmnd \
 		man/man1/wmnd.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/wmnd ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/wmnd.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/wmnd.1 ${STAGEDIR}${PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/wmndrc ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index be090b7daaf5..59c3d14d2561 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	keychain
 PORTVERSION=	2.8.5
 CATEGORIES=	security
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	User-friendly front-end to ssh-agent(1)
 WWW=		https://www.funtoo.org/Keychain
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	funtoo
 
 CONFLICTS_INSTALL=	py*-pycoin # bin/keychain
 
 OPTIONS_DEFINE=	DOCS
 
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/keychain.1.gz
 
 PORTDOCS=	ChangeLog README.md
 
 .if !exists(${LOCALBASE}/bin/ssh-agent) && !exists(/usr/bin/ssh-agent)
 RUN_DEPENDS+=	ssh-agent:security/openssh-portable
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '1 s,^.*,#!/bin/sh,' \
 		${WRKSRC}/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/keychain.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/keychain.1 ${STAGEDIR}${PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>