MANPREFIX: eleminate its usage and move man to share/man

31 files changed, 84 insertions, 79 deletions

diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index 0b4a9f1bfe77..7341a0457349 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gtimer
 PORTVERSION=	2.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
@@ -44,7 +44,7 @@ post-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 .for lang in cs cz es fr sv
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
diff --git a/deskutils/gtimer/pkg-plist b/deskutils/gtimer/pkg-plist
index 25d66ebfa71d..39086eafcd3b 100644
--- a/deskutils/gtimer/pkg-plist
+++ b/deskutils/gtimer/pkg-plist
@@ -1,5 +1,5 @@
 bin/gtimer
-man/man1/gtimer.1.gz
+share/man/man1/gtimer.1.gz
 share/locale/cs/LC_MESSAGES/gtimer.mo
 share/locale/cz/LC_MESSAGES/gtimer.mo
 share/locale/es/LC_MESSAGES/gtimer.mo
diff --git a/devel/cons-test/Makefile b/devel/cons-test/Makefile
index cf7bff74a7e8..30774ad2ef15 100644
--- a/devel/cons-test/Makefile
+++ b/devel/cons-test/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cons-test
 PORTVERSION=	2.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.dsmit.com/cons/stable/ \
 		http://www.gnu.org/software/cons/stable/ \
@@ -49,7 +49,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/Test/Cmd/Cons.pm \
 		${STAGEDIR}${PREFIX}/lib/${CONS_TEST}/Test/Cmd
 	${INSTALL_MAN} ${WRKSRC}/cons-test.1.gz \
-		${STAGEDIR}${MANPREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/cons-test/pkg-plist b/devel/cons-test/pkg-plist
index cb186d5e558f..26f28f51a3ca 100644
--- a/devel/cons-test/pkg-plist
+++ b/devel/cons-test/pkg-plist
@@ -131,4 +131,4 @@ lib/%%CONS_TEST%%/t/t0146.t
 lib/%%CONS_TEST%%/t/t0147.t
 lib/%%CONS_TEST%%/Test/Cmd.pm
 lib/%%CONS_TEST%%/Test/Cmd/Cons.pm
-man/man1/cons-test.1.gz
+share/man/man1/cons-test.1.gz
diff --git a/devel/covtool/Makefile b/devel/covtool/Makefile
index c4c47f8f9fab..8e3c54a504c8 100644
--- a/devel/covtool/Makefile
+++ b/devel/covtool/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	covtool
 PORTVERSION=	2.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/rel_2.0
 
@@ -23,7 +23,7 @@ post-patch:
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/man1/*.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_DATA} ${WRKSRC}/cov++.cfg ${STAGEDIR}${PREFIX}/etc/cov++.cfg.sample
 
 .include <bsd.port.mk>
diff --git a/devel/covtool/pkg-plist b/devel/covtool/pkg-plist
index 1e0588779a87..7ece00f2101b 100644
--- a/devel/covtool/pkg-plist
+++ b/devel/covtool/pkg-plist
@@ -7,11 +7,11 @@ bin/gen_html
 libexec/covtool/covtoolhelper.o
 libexec/covtool/covtoolhelper_debug.o
 libexec/covtool/covtoolhelper.c
-man/man1/cov++.1.gz
-man/man1/covannotate.1.gz
-man/man1/covmerge.1.gz
-man/man1/covtool.1.gz
-man/man1/gen_html.1.gz
+share/man/man1/cov++.1.gz
+share/man/man1/covannotate.1.gz
+share/man/man1/covmerge.1.gz
+share/man/man1/covtool.1.gz
+share/man/man1/gen_html.1.gz
 %%DATADIR%%/README
 %%DATADIR%%/COPYRIGHT
 %%DATADIR%%/covtool_version
diff --git a/devel/cvsdadm/Makefile b/devel/cvsdadm/Makefile
index dbee67ceb530..ca8a528111b5 100644
--- a/devel/cvsdadm/Makefile
+++ b/devel/cvsdadm/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cvsdadm
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/ \
 		SAVANNAH
@@ -23,13 +23,13 @@ PORTDOCS=	cvsdadm.README
 SHEBANG_FILES=	cvsdadm
 
 PLIST_FILES=	bin/cvsdadm \
-		man/man1/cvsdadm.1.gz
+		share/man/man1/cvsdadm.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cvsdadm ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/cvsdadm.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/cvsdadm.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/dxa65/Makefile b/devel/dxa65/Makefile
index e263395edf71..5ed152b4d885 100644
--- a/devel/dxa65/Makefile
+++ b/devel/dxa65/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	dxa
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.floodgap.com/retrotech/xa/dists/
 PKGNAMESUFFIX=	65
@@ -13,13 +14,13 @@ LICENSE=	GPLv2+
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 PORTDOCS=	INSTALL
-PLIST_FILES=	bin/dxa65 man/man1/dxa.1.gz
+PLIST_FILES=	bin/dxa65 share/man/man1/dxa.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dxa ${STAGEDIR}${PREFIX}/bin/dxa65
-	${INSTALL_MAN} ${WRKSRC}/dxa.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/dxa.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/fortran-utils/Makefile b/devel/fortran-utils/Makefile
index 5593aa323391..62d3ab658865 100644
--- a/devel/fortran-utils/Makefile
+++ b/devel/fortran-utils/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	fortran-utils
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/kris
 
@@ -11,8 +12,8 @@ WRKSRC=		${WRKDIR}/fortran-utils
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fpr/fpr ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/fsplit/fsplit ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/fpr/fpr.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/fpr/fpr.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/fsplit/fsplit.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/fortran-utils/pkg-plist b/devel/fortran-utils/pkg-plist
index 79c5da9ca6a7..3e4824aba062 100644
--- a/devel/fortran-utils/pkg-plist
+++ b/devel/fortran-utils/pkg-plist
@@ -1,4 +1,4 @@
 bin/fpr
 bin/fsplit
-man/man1/fpr.1.gz
-man/man1/fsplit.1.gz
+share/man/man1/fpr.1.gz
+share/man/man1/fsplit.1.gz
diff --git a/devel/fpp/Makefile b/devel/fpp/Makefile
index 59f7ac813edf..b60b6eca5de0 100644
--- a/devel/fpp/Makefile
+++ b/devel/fpp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fpp
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	NL/fortran/ \
 		http://ports.toco-domains.de/
@@ -17,13 +17,13 @@ OPTIONS_DEFINE=	DOCS
 PORTDOCS=	README fpp_spec fpp_license.ps
 
 PLIST_FILES=	bin/fpp \
-		man/man1/fpp.1.gz
+		share/man/man1/fpp.1.gz
 
 .include <bsd.port.options.mk>
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bsd44/fpp ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/man1/fpp.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/fpp.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
diff --git a/devel/gettext-lint/Makefile b/devel/gettext-lint/Makefile
index 4b2ec3a39795..bbc4c4310219 100644
--- a/devel/gettext-lint/Makefile
+++ b/devel/gettext-lint/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gettext-lint
 PORTVERSION=	0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0
 
@@ -27,7 +27,7 @@ do-install:
 .for i in POFileChecker POFileClean POFileConsistency POFileEquiv POFileFill \
 	POFileGlossary POFileSpell POFileStatus
 	${INSTALL_SCRIPT} ${WRKSRC}/src/${i} ${STAGEDIR}${PREFIX}/bin/${i}
-	${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${i}.1
+	${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${STAGEDIR}${PREFIX}/share/man/man1/${i}.1
 .endfor
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/src/*.py \
diff --git a/devel/gettext-lint/pkg-plist b/devel/gettext-lint/pkg-plist
index 9774c2366665..500d961f611b 100644
--- a/devel/gettext-lint/pkg-plist
+++ b/devel/gettext-lint/pkg-plist
@@ -11,14 +11,14 @@ bin/POFileStatus
 %%PYTHON_SITELIBDIR%%/gettext-lint/POFile.py
 %%PYTHON_SITELIBDIR%%/gettext-lint/capitalization.py
 %%PYTHON_SITELIBDIR%%/gettext-lint/util.py
-man/man1/POFileChecker.1.gz
-man/man1/POFileClean.1.gz
-man/man1/POFileConsistency.1.gz
-man/man1/POFileEquiv.1.gz
-man/man1/POFileFill.1.gz
-man/man1/POFileGlossary.1.gz
-man/man1/POFileSpell.1.gz
-man/man1/POFileStatus.1.gz
+share/man/man1/POFileChecker.1.gz
+share/man/man1/POFileClean.1.gz
+share/man/man1/POFileConsistency.1.gz
+share/man/man1/POFileEquiv.1.gz
+share/man/man1/POFileFill.1.gz
+share/man/man1/POFileGlossary.1.gz
+share/man/man1/POFileSpell.1.gz
+share/man/man1/POFileStatus.1.gz
 %%DATADIR%%/count.xsl
 %%DATADIR%%/report.css
 %%DATADIR%%/report.xsl
diff --git a/devel/ncc/Makefile b/devel/ncc/Makefile
index 4dd3113677e7..bba200bee3f0 100644
--- a/devel/ncc/Makefile
+++ b/devel/ncc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ncc
 PORTVERSION=	2.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://students.ceid.upatras.gr/~sxanth/ncc/
 
@@ -43,7 +43,7 @@ do-install:
 	${LN} -sf nccnav ${STAGEDIR}${PREFIX}/bin/nccnavi
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/ncc
 	${INSTALL_DATA}	${WRKSRC}/doc/nognu ${STAGEDIR}${PREFIX}/include/ncc
-	${INSTALL_MAN} ${WRKSRC}/ncc.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ncc.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/ncc/pkg-plist b/devel/ncc/pkg-plist
index 1c54e29e3ac1..b7fbaa071ba1 100644
--- a/devel/ncc/pkg-plist
+++ b/devel/ncc/pkg-plist
@@ -8,4 +8,4 @@ bin/nccnav
 bin/nccnavi
 bin/nccstrip2.py
 include/ncc/nognu
-man/man1/ncc.1.gz
+share/man/man1/ncc.1.gz
diff --git a/devel/p4delta/Makefile b/devel/p4delta/Makefile
index e29fc745f70f..0f33769499ab 100644
--- a/devel/p4delta/Makefile
+++ b/devel/p4delta/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	p4delta
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -13,13 +14,13 @@ USES=	ruby
 
 NO_BUILD=	yes
 
-PLIST_FILES=	bin/p4delta man/man1/p4delta.1.gz
+PLIST_FILES=	bin/p4delta share/man/man1/p4delta.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^#!/usr/bin/ruby|#!${RUBY}|' ${WRKSRC}/p4delta
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/p4delta.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/p4delta.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/pmccabe/Makefile b/devel/pmccabe/Makefile
index 43eddf718036..f28c2dc8517f 100644
--- a/devel/pmccabe/Makefile
+++ b/devel/pmccabe/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pmccabe
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.de.debian.org/debian/pool/main/p/pmccabe/ \
 		http://dist.codelabs.ru/fbsd/pmccabe/
@@ -25,7 +26,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .for f in ${MANPAGE}
-	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/pmccabe/pkg-plist b/devel/pmccabe/pkg-plist
index 868afc334f65..a2c8346ab8c9 100644
--- a/devel/pmccabe/pkg-plist
+++ b/devel/pmccabe/pkg-plist
@@ -2,7 +2,7 @@ bin/codechanges
 bin/decomment
 bin/pmccabe
 bin/vifn
-man/man1/codechanges.1.gz
-man/man1/decomment.1.gz
-man/man1/pmccabe.1.gz
-man/man1/vifn.1.gz
+share/man/man1/codechanges.1.gz
+share/man/man1/decomment.1.gz
+share/man/man1/pmccabe.1.gz
+share/man/man1/vifn.1.gz
diff --git a/devel/smv/Makefile b/devel/smv/Makefile
index 1ace9cb38491..03cfd1ad42f0 100644
--- a/devel/smv/Makefile
+++ b/devel/smv/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	smv
 PORTVERSION=	2.5.4.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cs.cmu.edu/~modelcheck/smv/
 DISTNAME=	${PORTNAME}.r${PORTVERSION}
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/smv ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/smv.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/smv.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/smv-mode.el ${STAGEDIR}${DATADIR}
 
diff --git a/devel/smv/pkg-plist b/devel/smv/pkg-plist
index 6b8bdd623e06..cb5a2a1368df 100644
--- a/devel/smv/pkg-plist
+++ b/devel/smv/pkg-plist
@@ -1,3 +1,3 @@
 bin/smv
 share/smv/smv-mode.el
-man/man1/smv.1.gz
+share/man/man1/smv.1.gz
diff --git a/dns/dlint/Makefile b/dns/dlint/Makefile
index a6fcc924cbbb..afca37b93d63 100644
--- a/dns/dlint/Makefile
+++ b/dns/dlint/Makefile
@@ -24,7 +24,7 @@ do-configure:
 do-install:
 	cd ${WRKSRC} ; ${INSTALL_SCRIPT} dlint digparse \
 		${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/dlint.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/dlint.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
diff --git a/dns/dlint/pkg-plist b/dns/dlint/pkg-plist
index 6e1429c5b53c..f5929a1b20d7 100644
--- a/dns/dlint/pkg-plist
+++ b/dns/dlint/pkg-plist
@@ -1,4 +1,4 @@
 sbin/dlint
 sbin/digparse
-man/man8/dlint.8.gz
+share/man/man8/dlint.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/dns/dnsutl/Makefile b/dns/dnsutl/Makefile
index 0a7230612f8d..d00040b2f473 100644
--- a/dns/dnsutl/Makefile
+++ b/dns/dnsutl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dnsutl
 PORTVERSION=	1.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
@@ -22,6 +22,6 @@ MAKE_JOBS_UNSAFE=	yes
 USES=		groff
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/man1/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man1/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/dns/dnsutl/pkg-plist b/dns/dnsutl/pkg-plist
index f741b5aa47fa..2c4514231cbf 100644
--- a/dns/dnsutl/pkg-plist
+++ b/dns/dnsutl/pkg-plist
@@ -10,16 +10,16 @@ bin/dns-hosts
 bin/dns-hosts-import
 bin/dns-ng
 bin/dns-rev
-man/man1/dns-boot-check.1.gz
-man/man1/dns-bootp.1.gz
-man/man1/dns-bootparams.1.gz
-man/man1/dns-conf-check.1.gz
-man/man1/dns-dhcp.1.gz
-man/man1/dns-ethers-import.1.gz
-man/man1/dns-ethers.1.gz
-man/man1/dns-filter.1.gz
-man/man1/dns-hosts-import.1.gz
-man/man1/dns-hosts.1.gz
-man/man1/dns-license.1.gz
-man/man1/dns-ng.1.gz
-man/man1/dns-rev.1.gz
+share/man/man1/dns-boot-check.1.gz
+share/man/man1/dns-bootp.1.gz
+share/man/man1/dns-bootparams.1.gz
+share/man/man1/dns-conf-check.1.gz
+share/man/man1/dns-dhcp.1.gz
+share/man/man1/dns-ethers-import.1.gz
+share/man/man1/dns-ethers.1.gz
+share/man/man1/dns-filter.1.gz
+share/man/man1/dns-hosts-import.1.gz
+share/man/man1/dns-hosts.1.gz
+share/man/man1/dns-license.1.gz
+share/man/man1/dns-ng.1.gz
+share/man/man1/dns-rev.1.gz
diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index bfa281c0bb09..32cd7ffbec8f 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	beav
 PORTVERSION=	1.40.18
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}_${PORTVERSION:R}.orig
@@ -26,7 +26,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/beav ${STAGEDIR}${PREFIX}/bin/beav
-	${INSTALL_MAN} ${WRKSRC}/beav.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/beav.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/editors/beav/pkg-plist b/editors/beav/pkg-plist
index c7f6ac7e927b..8d152646d06f 100644
--- a/editors/beav/pkg-plist
+++ b/editors/beav/pkg-plist
@@ -1,3 +1,3 @@
 bin/beav
-man/man1/beav.1.gz
+share/man/man1/beav.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/beav.txt
diff --git a/editors/edith/Makefile b/editors/edith/Makefile
index 9d2af50c7840..f253a74692f1 100644
--- a/editors/edith/Makefile
+++ b/editors/edith/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	edith
 PORTVERSION=	1.58
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors linux
 MASTER_SITES=	http://www.groenink.com/pub/edith/
 DISTFILES=	edith1.55.common.tar.gz \
@@ -36,6 +36,6 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${EDITHDIR}/${i}
 	${INSTALL_DATA} ${WRKSRC}/${i}/* ${STAGEDIR}${EDITHDIR}/${i}
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/edith.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/edith.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/editors/edith/pkg-plist b/editors/edith/pkg-plist
index 45d69a586d16..2d6b0c840bc3 100644
--- a/editors/edith/pkg-plist
+++ b/editors/edith/pkg-plist
@@ -72,4 +72,4 @@ lib/edith/help/trouble.html
 lib/edith/help/undoredo.html
 lib/edith/help/welcome.html
 lib/edith/help/windowsmenu.html
-man/man1/edith.1.gz
+share/man/man1/edith.1.gz
diff --git a/editors/sted/Makefile b/editors/sted/Makefile
index 6be1c8df6980..1470ddb0600d 100644
--- a/editors/sted/Makefile
+++ b/editors/sted/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sted
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	LOCAL/gabor
 
@@ -14,7 +15,7 @@ WRKSRC=		${WRKDIR}/sted
 MAKE_ARGS=	CC="${CC}" C_OPTS="${CFLAGS}" L_OPTS="${LDFLAGS} -lncurses"
 
 PORTDOCS=	CHANGES README
-PLIST_FILES=	bin/sted man/man1/sted.1.gz
+PLIST_FILES=	bin/sted share/man/man1/sted.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
@@ -23,7 +24,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sted ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sted.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/sted.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 6b3d3c0748e7..88c1cfc3e4f2 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ted
 PORTVERSION=	2.23
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		http://fossies.org/linux/misc/
@@ -68,8 +68,8 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/tedPackage/examples/rtf2*.sh ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/tedPackage/doc/Ted.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tedPackage/doc/rtf2*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tedPackage/doc/Ted.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tedPackage/doc/rtf2*.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/tedPackage/ps/*.ps ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${AFMDIR}
diff --git a/editors/ted/pkg-plist b/editors/ted/pkg-plist
index 4daa3e9af131..c7741a320052 100644
--- a/editors/ted/pkg-plist
+++ b/editors/ted/pkg-plist
@@ -4,9 +4,9 @@ bin/rtf2html.sh
 bin/rtf2pdf.sh
 bin/rtf2ps.sh
 bin/rtf2txt.sh
-man/man1/Ted.1.gz
-man/man1/rtf2pdf.1.gz
-man/man1/rtf2ps.1.gz
+share/man/man1/Ted.1.gz
+share/man/man1/rtf2pdf.1.gz
+share/man/man1/rtf2ps.1.gz
 %%DATADIR%%/afm/AvantGarde-Book.afm
 %%DATADIR%%/afm/AvantGarde-BookOblique.afm
 %%DATADIR%%/afm/AvantGarde-Demi.afm