git: 03c7f3c4124c - main - MANPREFIX: eleminate its usage and move man to share/man

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Tue, 09 Jan 2024 10:32:21 UTC
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=03c7f3c4124caf0cd8735753986ee630eadd37a1

commit 03c7f3c4124caf0cd8735753986ee630eadd37a1
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-09 10:32:12 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-01-09 10:32:17 +0000

    MANPREFIX: eleminate its usage  and move man to share/man
---
 math/grace/Makefile                |   6 +-
 math/grace/pkg-plist               |  10 +-
 math/ploticus/Makefile             |   6 +-
 math/ploticus/pkg-plist            |   4 +-
 math/reduce-psl/Makefile           |   3 +-
 math/reduce-psl/pkg-plist.amd64    |   2 +-
 math/reduce-psl/pkg-plist.i386     |   2 +-
 math/xspread/Makefile              |  11 ++-
 misc/aclgen/Makefile               |   5 +-
 misc/apparix/Makefile              |   5 +-
 misc/dtach/Makefile                |   5 +-
 misc/imerge/Makefile               |   5 +-
 misc/inplace/Makefile              |   6 +-
 misc/ipbt/Makefile                 |   5 +-
 misc/iselect/Makefile              |   6 +-
 misc/kcd/Makefile                  |   4 +-
 misc/kcd/pkg-plist                 |   2 +-
 misc/rpl/Makefile                  |   5 +-
 misc/sssnips/Makefile              |   5 +-
 misc/translate/Makefile            |   5 +-
 misc/ttyrec/Makefile               |   6 +-
 misc/viz/Makefile                  |   6 +-
 misc/whichman/Makefile             |   7 +-
 multimedia/vtkmpeg2encode/Makefile |   6 +-
 net-mgmt/cdpd/Makefile             |   6 +-
 net-mgmt/grepcidr/Makefile         |   5 +-
 net-mgmt/openlldp/Makefile         |   6 +-
 net-p2p/gtk-gnutella/Makefile      |   4 +-
 net-p2p/gtk-gnutella/pkg-plist     |   2 +-
 net/aget/Makefile                  |   4 +-
 net/arp-sk/Makefile                |   6 +-
 net/gnetcat/Makefile               |   4 +-
 net/httpry/Makefile                |   3 +-
 net/httpry/pkg-plist               |   2 +-
 net/icpld/Makefile                 |   6 +-
 net/ipgrab/Makefile                |   6 +-
 net/mping/Makefile                 |   5 +-
 net/nifmon/Makefile                |   5 +-
 net/openmpi/Makefile               |   2 +-
 net/redir/Makefile                 |   6 +-
 net/sbm/Makefile                   |   5 +-
 net/tcpmssd/Makefile               |   6 +-
 net/tcpshow/Makefile               |   4 +-
 net/tcpshow/pkg-plist              |   2 +-
 net/x2goclient/Makefile            |   4 +-
 net/x2goclient/pkg-plist           |   2 +-
 net/zsync/Makefile                 |   2 +-
 news/aub/Makefile                  |   6 +-
 news/golded+/Makefile              |   3 +-
 news/golded+/pkg-plist             |   6 +-
 news/gup/Makefile                  |   5 +-
 news/mmail/Makefile                |   5 +-
 news/newspost/Makefile             |   6 +-
 news/nget/Makefile                 |   6 +-
 news/nget/pkg-plist                |   4 +-
 news/nn/Makefile                   |   4 +-
 news/nn/pkg-plist                  |  28 +++---
 news/noffle/Makefile               |   6 +-
 news/noffle/pkg-plist              |   6 +-
 ports-mgmt/genpatch/Makefile       |  10 +-
 ports-mgmt/portal/Makefile         |   6 +-
 ports-mgmt/porttree/Makefile       |   4 +-
 print/bibcursed/Makefile           |   5 +-
 print/catdvi/Makefile              |   6 +-
 print/dvi2tty/Makefile             |   7 +-
 print/makeindex/Makefile           |   4 +-
 print/makeindex/pkg-plist          |   2 +-
 print/nenscript/Makefile           |   3 +-
 print/nenscript/pkg-plist          |   2 +-
 print/panda/Makefile               |   4 +-
 print/panda/pkg-plist              | 182 ++++++++++++++++++-------------------
 print/pcal/Makefile                |   3 +-
 print/pcal/pkg-plist               |   2 +-
 print/pfbtopfa/Makefile            |   6 +-
 science/epte/Makefile              |   6 +-
 science/pulseview/Makefile         |   6 +-
 76 files changed, 296 insertions(+), 271 deletions(-)

diff --git a/math/grace/Makefile b/math/grace/Makefile
index 9886ae97b2a9..a96aa5bf1198 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	grace
 PORTVERSION=	5.1.25
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math print
 MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/graphics/grace/src/stable/ \
 		ftp://ftp.ntua.gr/pub/graphics/grace/src/stable/ \
@@ -66,11 +66,11 @@ post-configure:
 		's|$$(GRACE_HOME)/bin|$$(PREFIX)/bin|'
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/[c-g]*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/[c-g]*.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_DATA} ${FILESDIR}/mini-xmgr3.xpm \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf xmgrace ${STAGEDIR}${PREFIX}/bin/grace
-	${LN} -sf grace.1 ${STAGEDIR}${MANPREFIX}/man/man1/xmgrace.1
+	${LN} -sf grace.1 ${STAGEDIR}${PREFIX}/share/man/man1/xmgrace.1
 	${LN} -sf ${DOCSDIR} ${STAGEDIR}${DATADIR}/doc
 	${LN} -sf ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
 
diff --git a/math/grace/pkg-plist b/math/grace/pkg-plist
index 9fefda4b5951..fdc98babc1ac 100644
--- a/math/grace/pkg-plist
+++ b/math/grace/pkg-plist
@@ -6,11 +6,11 @@ bin/grconvert
 bin/xmgrace
 include/grace_np.h
 lib/libgrace_np.a
-man/man1/convcal.1.gz
-man/man1/grace.1.gz
-man/man1/gracebat.1.gz
-man/man1/grconvert.1.gz
-man/man1/xmgrace.1.gz
+share/man/man1/convcal.1.gz
+share/man/man1/grace.1.gz
+share/man/man1/gracebat.1.gz
+share/man/man1/grconvert.1.gz
+share/man/man1/xmgrace.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/10.1.dat
 %%PORTDOCS%%%%DOCSDIR%%/10a.dat
 %%PORTDOCS%%%%DOCSDIR%%/10b.dat
diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index ba2a0c24522a..a77e80abde6a 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ploticus
 PORTVERSION=	2.40
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	math
 MASTER_SITES=	SF
 DISTNAME=	pl${PORTVERSION:S/.//}src
@@ -49,8 +49,8 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/prefabs && ${FIND} . | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}
-	${INSTALL_MAN} ${WRKSRC}/man/man1/pl.1 ${STAGEDIR}${MANPREFIX}/man/man1/ploticus.1
-	${INSTALL_MAN} ${WRKSRC}/man/man3/libploticus.3 ${STAGEDIR}${MANPREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/man/man1/pl.1 ${STAGEDIR}${PREFIX}/share/man/man1/ploticus.1
+	${INSTALL_MAN} ${WRKSRC}/man/man3/libploticus.3 ${STAGEDIR}${PREFIX}/share/man/man3
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/pltestsuite && ${FIND} . \! -name "*.orig" | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/math/ploticus/pkg-plist b/math/ploticus/pkg-plist
index cdb9edbf49df..d1f6e9ad74f1 100644
--- a/math/ploticus/pkg-plist
+++ b/math/ploticus/pkg-plist
@@ -1,6 +1,6 @@
 bin/ploticus
-man/man1/ploticus.1.gz
-man/man3/libploticus.3.gz
+share/man/man1/ploticus.1.gz
+share/man/man3/libploticus.3.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Diag.out
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
diff --git a/math/reduce-psl/Makefile b/math/reduce-psl/Makefile
index 324ea76fdba7..b610fa451289 100644
--- a/math/reduce-psl/Makefile
+++ b/math/reduce-psl/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	reduce
 PORTVERSION=	${SFSUBDIR:S/snapshot_//:S/-//g}
+PORTREVISION=	1
 CATEGORIES=	math lang
 MASTER_SITES=	SF/reduce-algebra/${SFSUBDIR}/
 PKGNAMESUFFIX=	-psl
@@ -37,7 +38,7 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${FILESDIR}/runpsl.sh ${STAGEDIR}${PREFIX}/bin/redpsl
-	${INSTALL_MAN} ${FILESDIR}/redpsl.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${FILESDIR}/redpsl.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 	${MKDIR} ${STAGEDIR}${DATADIR}/psl
 	${INSTALL_PROGRAM} ${REDUCE_BINS}/psl/bpsl ${STAGEDIR}${DATADIR}/psl/
 	(cd ${REDUCE_BINS}/psl && ${COPYTREE_SHARE} . \
diff --git a/math/reduce-psl/pkg-plist.amd64 b/math/reduce-psl/pkg-plist.amd64
index d66474477717..4741954249f4 100644
--- a/math/reduce-psl/pkg-plist.amd64
+++ b/math/reduce-psl/pkg-plist.amd64
@@ -1,5 +1,5 @@
 bin/redpsl
-man/man1/redpsl.1.gz
+share/man/man1/redpsl.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/insidereduce.pdf
 %%PORTDOCS%%%%DOCSDIR%%/manual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/primer.pdf
diff --git a/math/reduce-psl/pkg-plist.i386 b/math/reduce-psl/pkg-plist.i386
index 4d52bd888a08..17ccb47f3d32 100644
--- a/math/reduce-psl/pkg-plist.i386
+++ b/math/reduce-psl/pkg-plist.i386
@@ -1,5 +1,5 @@
 bin/redpsl
-man/man1/redpsl.1.gz
+share/man/man1/redpsl.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/insidereduce.pdf
 %%PORTDOCS%%%%DOCSDIR%%/manual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/primer.pdf
diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index 465da2df9492..e59edda7b823 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xspread
 PORTVERSION=	3.1.1c
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	http://archive.debian.org/%SUBDIR%/ \
 		http://mirror.safehostnet.com/debian-archive/%SUBDIR%/ \
@@ -20,8 +20,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	*
-PLIST_FILES=	bin/pxspread bin/xspread man/man1/pxspread.1.gz \
-		man/man1/xspread.1.gz
+PLIST_FILES=	bin/pxspread bin/xspread \
+		share/man/man1/pxspread.1.gz \
+		share/man/man1/xspread.1.gz
 
 OPTIONS_DEFINE=	X11 DOCS
 
@@ -38,8 +39,8 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pxspread ${STAGEDIR}${PREFIX}/bin/pxspread
 	${INSTALL_PROGRAM} ${WRKSRC}/xspread ${STAGEDIR}${PREFIX}/bin/xspread
-	${INSTALL_MAN} ${WRKSRC}/pxspread.man ${STAGEDIR}${MANPREFIX}/man/man1/pxspread.1
-	${INSTALL_MAN} ${WRKSRC}/xspread.man ${STAGEDIR}${MANPREFIX}/man/man1/xspread.1
+	${INSTALL_MAN} ${WRKSRC}/pxspread.man ${STAGEDIR}${PREFIX}/share/man/man1/pxspread.1
+	${INSTALL_MAN} ${WRKSRC}/xspread.man ${STAGEDIR}${PREFIX}/share/man/man1/xspread.1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/misc/aclgen/Makefile b/misc/aclgen/Makefile
index f4205106faa2..38b8b69326d8 100644
--- a/misc/aclgen/Makefile
+++ b/misc/aclgen/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	aclgen
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://gatling.ikk.sztaki.hu/pub/aclgen/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//}
@@ -14,7 +15,7 @@ MAKEFILE=	/usr/share/mk/bsd.prog.mk
 MAKE_ARGS=	PROG=aclgen
 
 PLIST_FILES=	bin/aclgen \
-		man/man1/aclgen.1.gz
+		share/man/man1/aclgen.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -23,6 +24,6 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/aclgen ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/aclgen.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/aclgen.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/misc/apparix/Makefile b/misc/apparix/Makefile
index 4cf754c7c291..24484d4df7da 100644
--- a/misc/apparix/Makefile
+++ b/misc/apparix/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	apparix
 PORTVERSION=	20110303
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://micans.org/apparix/src/
 DISTNAME=	${PORTNAME}-11-062
@@ -14,13 +15,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	apparix.azm apparix.html apparix.ps
-PLIST_FILES=	bin/apparix man/man1/apparix.1.gz
+PLIST_FILES=	bin/apparix share/man/man1/apparix.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/apparix ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/apparix.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/apparix.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/misc/dtach/Makefile b/misc/dtach/Makefile
index 1cafd9ef40d5..311bc57431c2 100644
--- a/misc/dtach/Makefile
+++ b/misc/dtach/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	dtach
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF
 
@@ -14,13 +15,13 @@ GNU_CONFIGURE=	yes
 ALL_TARGET=	dtach
 
 PORTDOCS=	README
-PLIST_FILES=	bin/dtach man/man1/dtach.1.gz
+PLIST_FILES=	bin/dtach share/man/man1/dtach.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dtach ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/dtach.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/dtach.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/misc/imerge/Makefile b/misc/imerge/Makefile
index 1734d227b575..eb747f2860eb 100644
--- a/misc/imerge/Makefile
+++ b/misc/imerge/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	imerge
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		LOCAL/knu
@@ -10,10 +11,10 @@ WWW=		https://github.com/knu/imerge
 
 USES=		tar:bzip2 uidfix
 
-MAKE_ARGS=	PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}"
+MAKE_ARGS=	PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/share"
 MAKEFILE=	BSDmakefile
 
 PLIST_FILES=	bin/imerge \
-		man/man1/imerge.1.gz
+		share/man/man1/imerge.1.gz
 
 .include <bsd.port.mk>
diff --git a/misc/inplace/Makefile b/misc/inplace/Makefile
index 425cd43178e7..4a5e23cb38c4 100644
--- a/misc/inplace/Makefile
+++ b/misc/inplace/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	inplace
 PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		LOCAL/knu
@@ -11,13 +11,13 @@ WWW=		https://akinori.org/ #inplace
 
 USES=		tar:bzip2 uidfix ruby shebangfix
 
-MAKE_ARGS=	PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}"
+MAKE_ARGS=	PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/share"
 MAKEFILE=	BSDmakefile
 
 SHEBANG_FILES=	lib/inplace.rb
 
 PLIST_FILES=	bin/inplace \
-		man/man1/inplace.1.gz
+		share/man/man1/inplace.1.gz
 
 test: build
 	cd ${WRKSRC}; ${MAKE} test
diff --git a/misc/ipbt/Makefile b/misc/ipbt/Makefile
index c51c5be3de77..7223b023d815 100644
--- a/misc/ipbt/Makefile
+++ b/misc/ipbt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ipbt
 DISTVERSION=	r8765
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.chiark.greenend.org.uk/~sgtatham/ipbt/ \
 		LOCAL/uqs
@@ -15,13 +16,13 @@ LICENSE_FILE=	${WRKSRC}/LICENCE
 
 ALL_TARGET=	${PORTNAME}
 MAKE_ARGS=	LFLAGS="${LDFLAGS}" NCURSES_LIB="${NCURSESLIBS}"
-PLIST_FILES=	bin/ipbt bin/ttygrep bin/ttydump man/man1/ipbt.1.gz
+PLIST_FILES=	bin/ipbt bin/ttygrep bin/ttydump share/man/man1/ipbt.1.gz
 SHEBANG_FILES=	sbcsgen.pl Makefile ttygrep ttydump
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/ttydump ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/ttygrep ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ipbt.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ipbt.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile
index 3fada1bd10bc..896c3a878268 100644
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	iselect
 PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	OSSP/tool/iselect
 
@@ -21,7 +21,7 @@ perl_OLD_CMD=	/sw/bin/perl
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	LDFLAGS="${LDFLAGS}"
 
-PLIST_FILES=	bin/iselect man/man1/iselect.1.gz
+PLIST_FILES=	bin/iselect share/man/man1/iselect.1.gz
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	SLANG EXAMPLES
@@ -36,7 +36,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/iselect ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/iselect.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/iselect.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/example && ${FIND} . | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index d7cffaee3988..6c2c73ac49a3 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kcd
 PORTVERSION=	7.15.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF
@@ -25,7 +25,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/kcd-inst ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/kcdscr ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/kcdmain ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/kcd.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/kcd.1 ${STAGEDIR}${PREFIX}/share/man/man1
 .for i in en_GB en_GB.UTF-8 en_US.UTF-8
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${i}.gmo \
diff --git a/misc/kcd/pkg-plist b/misc/kcd/pkg-plist
index 9c841513229f..2655af075c32 100644
--- a/misc/kcd/pkg-plist
+++ b/misc/kcd/pkg-plist
@@ -1,7 +1,7 @@
 bin/kcd-inst
 bin/kcdmain
 bin/kcdscr
-man/man1/kcd.1.gz
+share/man/man1/kcd.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kcd.csh.init
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kcd.sh.init
diff --git a/misc/rpl/Makefile b/misc/rpl/Makefile
index 1dc1051b8d04..5e8ebc7dae3d 100644
--- a/misc/rpl/Makefile
+++ b/misc/rpl/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	rpl
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://downloads.laffeycomputer.com/current_builds/
 
@@ -11,10 +12,10 @@ LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/rpl man/man1/rpl.1.gz
+PLIST_FILES=	bin/rpl share/man/man1/rpl.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/rpl ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/rpl.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/rpl.1 ${STAGEDIR}${MANPREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/misc/sssnips/Makefile b/misc/sssnips/Makefile
index 415b1845dff5..fe461b52d053 100644
--- a/misc/sssnips/Makefile
+++ b/misc/sssnips/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sssnips
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://devel.ringlet.net/files/misc/sssnips/
 
@@ -10,10 +11,10 @@ WWW=		https://devel.ringlet.net/misc/sssnips/
 LICENSE=	BSD2CLAUSE
 
 USES=		gmake tar:xz
-MAKE_ENV=	BINGRP=wheel MANDIR=${MANPREFIX}/man/man
+MAKE_ENV=	BINGRP=wheel MANDIR=${PREFIX}/share/man/man
 
 PLIST_FILES=	${PROGRAMS:S@^@bin/@} \
-		${PROGRAMS:S@^@man/man1/@:S@$@.1.gz@}
+		${PROGRAMS:S@^@share/man/man1/@:S@$@.1.gz@}
 
 PROGRAMS=	bigfile csort declean getkey git-ss git-ssnoq git-ssq \
 		hostsearch mkv noagent qidiff qpr resock signfiles stun \
diff --git a/misc/translate/Makefile b/misc/translate/Makefile
index f8a20db40ace..94191f3d6976 100644
--- a/misc/translate/Makefile
+++ b/misc/translate/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	translate
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	misc perl5
 MASTER_SITES=	http://www.freebsdcluster.org/~mich/software/
 
@@ -13,11 +14,11 @@ NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-PLIST_FILES=	bin/translate man/man1/translate.1.gz
+PLIST_FILES=	bin/translate share/man/man1/translate.1.gz
 SHEBANG_FILES=	translate
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/misc/ttyrec/Makefile b/misc/ttyrec/Makefile
index 0e34e6d38162..f83b37556c91 100644
--- a/misc/ttyrec/Makefile
+++ b/misc/ttyrec/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ttyrec
 PORTVERSION=	1.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	http://0xcc.net/ttyrec/
 
@@ -15,7 +15,7 @@ OPENPTY_DESC=	Use openpty instead
 OPTIONS_DEFAULT=	OPENPTY
 
 PLIST_FILES=	bin/ttyplay bin/ttyrec bin/ttytime \
-		man/man1/ttyplay.1.gz man/man1/ttyrec.1.gz
+		share/man/man1/ttyplay.1.gz share/man/man1/ttyrec.1.gz
 
 OPENPTY_CFLAGS=	-DHAVE_openpty -lutil
 
@@ -24,6 +24,6 @@ post-patch:
 
 do-install:
 	cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ttyplay ttyrec ttytime ${STAGEDIR}${PREFIX}/bin/
-	cd ${WRKSRC}/ && ${INSTALL_MAN} ttyplay.1 ttyrec.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+	cd ${WRKSRC}/ && ${INSTALL_MAN} ttyplay.1 ttyrec.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/misc/viz/Makefile b/misc/viz/Makefile
index 512a357a77b7..353a577576cc 100644
--- a/misc/viz/Makefile
+++ b/misc/viz/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	viz
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	LOCAL/fenner
 
@@ -14,12 +14,12 @@ USES=		tar:tgz
 
 MAKE_ARGS=	CC="${CC}" DEFS="${CFLAGS}"
 
-PLIST_FILES=	bin/viz bin/inviz man/man1/viz.1.gz man/man1/inviz.1.gz
+PLIST_FILES=	bin/viz bin/inviz share/man/man1/viz.1.gz share/man/man1/inviz.1.gz
 
 do-install:
 .for f in viz inviz
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 
 .include <bsd.port.mk>
diff --git a/misc/whichman/Makefile b/misc/whichman/Makefile
index 1a28b0a52619..575445092a37 100644
--- a/misc/whichman/Makefile
+++ b/misc/whichman/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	whichman
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://main.linuxfocus.org/~guido.socher/ \
 		http://main.linuxfocus.org/~guido/
@@ -11,8 +12,8 @@ WWW=		http://main.linuxfocus.org/~guido/ #whichman
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 PLIST_FILES=	bin/ftff bin/ftwhich bin/whichman \
-		man/man1/ftff.1.gz man/man1/ftwhich.1.gz \
-		man/man1/whichman.1.gz
+		share/man/man1/ftff.1.gz share/man/man1/ftwhich.1.gz \
+		share/man/man1/whichman.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/man:||g' ${WRKSRC}/whichman.c
@@ -20,7 +21,7 @@ post-patch:
 do-install:
 .for name in ftff ftwhich whichman
 	${INSTALL_PROGRAM} ${WRKSRC}/${name} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man1/${name}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man1/${name}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 
 .include <bsd.port.mk>
diff --git a/multimedia/vtkmpeg2encode/Makefile b/multimedia/vtkmpeg2encode/Makefile
index 90526313c181..8f75b64f6902 100644
--- a/multimedia/vtkmpeg2encode/Makefile
+++ b/multimedia/vtkmpeg2encode/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vtkmpeg2encode
 PORTVERSION=	${VTK_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia math
 MASTER_SITES=	http://www.vtk.org/files/support/ \
 		http://www.neuro.mcw.edu/Ports/distfiles/VTK5/
@@ -33,7 +33,7 @@ PLIST_FILES=	lib/${MPEGLIB}.so.${PORTVERSION} \
 		include/vtk-${VTK_VERSION:R}/mpeg2enc.h \
 		include/vtk-${VTK_VERSION:R}/mpeg2enc_config.h \
 		include/vtk-${VTK_VERSION:R}/vlc.h \
-		man/man3/vtkmpeg2encode.3.gz
+		share/man/man3/vtkmpeg2encode.3.gz
 
 post-build:
 	${MV} ${WRKSRC}/${MPEGLIB}.so ${WRKSRC}/${MPEGLIB}.so.${PORTVERSION}
@@ -53,6 +53,6 @@ do-install:
 			${WRKSRC}/mpeg2enc_config.h \
 			${WRKSRC}/vlc.h \
 			${STAGEDIR}${PREFIX}/include/vtk-${VTK_VERSION:R}
-	${INSTALL_MAN}	${WRKDIR}/vtkmpeg2encode.3 ${STAGEDIR}${MANPREFIX}/man/man3
+	${INSTALL_MAN}	${WRKDIR}/vtkmpeg2encode.3 ${STAGEDIR}${PREFIX}/share/man/man3
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/cdpd/Makefile b/net-mgmt/cdpd/Makefile
index a5f407016833..50dc40728762 100644
--- a/net-mgmt/cdpd/Makefile
+++ b/net-mgmt/cdpd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cdpd
 PORTVERSION=	1.0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://snar.spb.ru/prog/cdpd/
 
@@ -14,10 +14,10 @@ USES=		tar:tgz
 GNU_CONFIGURE=	yes
 
 USE_RC_SUBR=	cdpd
-PLIST_FILES=	sbin/cdpd man/man8/cdpd.8.gz
+PLIST_FILES=	sbin/cdpd share/man/man8/cdpd.8.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cdpd ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/cdpd.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/cdpd.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/grepcidr/Makefile b/net-mgmt/grepcidr/Makefile
index 54fe33db58ad..de3cf7a53d6b 100644
--- a/net-mgmt/grepcidr/Makefile
+++ b/net-mgmt/grepcidr/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	grepcidr
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt textproc
 MASTER_SITES=	http://www.pc-tools.net/files/unix/ \
 		ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
@@ -13,14 +14,14 @@ LICENSE=	GPLv2
 USES=		gmake
 
 PLIST_FILES=	bin/grepcidr \
-		man/man1/grepcidr.1.gz
+		share/man/man1/grepcidr.1.gz
 
 do-configure:
 	${REINPLACE_CMD} \
 		-e 's|PREFIX=.*|PREFIX=${PREFIX}|' \
 		-e 's|CFLAGS=.*|CFLAGS=${CFLAGS}|' \
 		-e 's|DESTDIR=.*|DESTDIR=${STAGEDIR}|' \
-		-e 's|MANDIR=.*|MANDIR=${MANPREFIX}/man|' \
+		-e 's|MANDIR=.*|MANDIR=${PREFIX}/share/man|' \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/openlldp/Makefile b/net-mgmt/openlldp/Makefile
index 80cd4c926861..f32826824bbd 100644
--- a/net-mgmt/openlldp/Makefile
+++ b/net-mgmt/openlldp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openlldp
 DISTVERSION=	0.4alpha
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 GNU_CONFIGURE=	yes
 
 USE_RC_SUBR=	lldpd
-PLIST_FILES=	sbin/lldpd bin/lldpneighbors man/man8/lldpd.8.gz
+PLIST_FILES=	sbin/lldpd bin/lldpneighbors share/man/man8/lldpd.8.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/^CFLAGS =/CFLAGS +=/g' \
@@ -23,6 +23,6 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/lldpd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/lldpneighbors ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${FILESDIR}/lldpd.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${FILESDIR}/lldpd.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 8ad1bca53055..59d92ee44521 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gtk-gnutella
 PORTVERSION=	1.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
@@ -20,7 +20,7 @@ CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-O -Dyacc='byacc' \
 		-Dprefix='${PREFIX}' \
 		-Dprivlib='${DATADIR}' \
-		-Dmansrc='${MANPREFIX}/man/man1' \
+		-Dmansrc='${PREFIX}/share/man/man1' \
 		-Dlocale='${PREFIX}/share/locale' \
 		-Dcc='${CC}' -Doptimize='${CFLAGS}' \
 		-Dccflags='${CPPFLAGS}' -Dldflags='${LDFLAGS}' \
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index 934916bc9d0e..00e3080b8cb9 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -1,5 +1,5 @@
 bin/gtk-gnutella
-man/man1/gtk-gnutella.1.gz
+share/man/man1/gtk-gnutella.1.gz
 share/appdata/gtk-gnutella.appdata.xml
 share/applications/gtk-gnutella.desktop
 %%DATADIR%%/%%ARCH%%-%%OPSYS%%/gtk-gnutella.nm
diff --git a/net/aget/Makefile b/net/aget/Makefile
index 03b166b527a0..79d73b6b2ca3 100644
--- a/net/aget/Makefile
+++ b/net/aget/Makefile
@@ -14,10 +14,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 LDFLAGS+=	-pthread
 
-PLIST_FILES=	bin/aget man/man1/aget.1.gz
+PLIST_FILES=	bin/aget share/man/man1/aget.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/aget ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/aget.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/aget.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/net/arp-sk/Makefile b/net/arp-sk/Makefile
index 82988154bfc7..e86662e4f241 100644
--- a/net/arp-sk/Makefile
+++ b/net/arp-sk/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	arp-sk
 PORTVERSION=	0.0.16
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	http://sid.rstack.org/arp-sk/files/
 EXTRACT_SUFX=	.tgz
@@ -13,10 +13,10 @@ LIB_DEPENDS=	libnet.so:net/libnet
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libnet=${LOCALBASE}
 
-PLIST_FILES=	sbin/arp-sk man/man1/arp-sk.1.gz
+PLIST_FILES=	sbin/arp-sk share/man/man1/arp-sk.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/arp-sk ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/man/arp-sk.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/arp-sk.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/net/gnetcat/Makefile b/net/gnetcat/Makefile
index f9586c7c405c..3409c391ea83 100644
--- a/net/gnetcat/Makefile
+++ b/net/gnetcat/Makefile
@@ -13,12 +13,12 @@ USES=		gettext iconv tar:bzip2
 GNU_CONFIGURE=	yes
 
 INFO=		gnetcat
-PLIST_FILES=	bin/gnetcat man/man1/gnetcat.1.gz
+PLIST_FILES=	bin/gnetcat share/man/man1/gnetcat.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/netcat ${STAGEDIR}${PREFIX}/bin/gnetcat
 	${INSTALL_MAN} ${WRKSRC}/doc/netcat.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/gnetcat.1
+		${STAGEDIR}${PREFIX}/share/man/man1/gnetcat.1
 	${INSTALL_DATA} ${WRKSRC}/doc/netcat.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH}/gnetcat.info
 
diff --git a/net/httpry/Makefile b/net/httpry/Makefile
index f906f62ead96..86aff717cb4d 100644
--- a/net/httpry/Makefile
+++ b/net/httpry/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	httpry
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://dumpsterventures.com/jason/httpry/
 
@@ -25,7 +26,7 @@ PLIST_SUB+=	EXTRASCRIPTS="@comment "
 
 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
 .if ${PORT_OPTIONS:MEXTRASCRIPTS}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin/httpry-scripts
 	(cd ${WRKSRC}/scripts/ && \
diff --git a/net/httpry/pkg-plist b/net/httpry/pkg-plist
index 57340ce80608..eba9e697c37e 100644
--- a/net/httpry/pkg-plist
+++ b/net/httpry/pkg-plist
@@ -1,5 +1,5 @@
 bin/httpry
-man/man1/httpry.1.gz
+share/man/man1/httpry.1.gz
 %%EXTRASCRIPTS%%bin/httpry-scripts/parse_log.pl
 %%EXTRASCRIPTS%%bin/httpry-scripts/rotate_log.pl
 %%EXTRASCRIPTS%%bin/httpry-scripts/process_logs
diff --git a/net/icpld/Makefile b/net/icpld/Makefile
index bf44e5dacae5..27d89c9c6426 100644
--- a/net/icpld/Makefile
+++ b/net/icpld/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	icpld
 PORTVERSION=	1.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.ibiblio.org/icpld/download/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	yes
 
 PORTDOCS=	README
 PLIST_FILES=	bin/icpld etc/icpld.conf.sample etc/rc.d/icpld.sh.sample \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 OPTIONS_DEFINE=	IPV6 DOCS
 
@@ -22,7 +22,7 @@ IPV6_CONFIGURE_ENABLE=	ipv6
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${ECHO_MSG} '===> Installing ${STAGEDIR}${PREFIX}/etc/icpld.conf.sample file.'
 	${INSTALL_DATA} ${WRKSRC}/icpld.conf.sample ${STAGEDIR}${PREFIX}/etc
 	@${ECHO_MSG} '===> Installing ${STAGEDIR}${PREFIX}/etc/rc.d/icpld.sh.sample'
diff --git a/net/ipgrab/Makefile b/net/ipgrab/Makefile
index ab1be3c9016f..862b7f165bed 100644
--- a/net/ipgrab/Makefile
+++ b/net/ipgrab/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ipgrab
 PORTVERSION=	0.9.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net security
 MASTER_SITES=	SF
 
@@ -16,7 +16,7 @@ INFO=		ipgrab
 DOCS=		README AUTHORS COPYING ChangeLog \
 		DEVELOPER-HOWTO INSTALL NEWS TODO
 
-PLIST_FILES=	bin/ipgrab man/man8/ipgrab.8.gz
+PLIST_FILES=	bin/ipgrab share/man/man8/ipgrab.8.gz
 
 PORTDOCS=	README AUTHORS COPYING ChangeLog DEVELOPER-HOWTO \
 		INSTALL NEWS TODO
@@ -24,7 +24,7 @@ PORTDOCS=	README AUTHORS COPYING ChangeLog DEVELOPER-HOWTO \
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/ipgrab.8 ${STAGEDIR}${MANPREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/doc/ipgrab.8 ${STAGEDIR}${PREFIX}/share/man/man8/
 	${INSTALL_DATA} ${WRKSRC}/doc/ipgrab.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ipgrab ${STAGEDIR}${PREFIX}/bin/
 
diff --git a/net/mping/Makefile b/net/mping/Makefile
index af7cebb682e4..1afbe9a525f8 100644
--- a/net/mping/Makefile
+++ b/net/mping/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mping
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://mping.uninett.no/
 
@@ -13,14 +14,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	sbin/mping \
-		man/man8/mping.8.gz
+		share/man/man8/mping.8.gz
 PORTDOCS=	ChangeLog README TODO
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mping ${STAGEDIR}${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/man/mping.8 ${STAGEDIR}${MANPREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/man/mping.8 ${STAGEDIR}${PREFIX}/share/man/man8/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/net/nifmon/Makefile b/net/nifmon/Makefile
index 70f1275156a7..5b4319ce5a2a 100644
--- a/net/nifmon/Makefile
+++ b/net/nifmon/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	nifmon
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.freebsd-support.de/misc/
 
@@ -9,10 +10,10 @@ WWW=		http://www.freebsd-support.de/misc/
 
 USES=		ncurses
 MAKE_ARGS=	LDADD="-lncurses"
-PLIST_FILES=	bin/nifmon man/man8/nifmon.8.gz
+PLIST_FILES=	bin/nifmon share/man/man8/nifmon.8.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nifmon ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/nifmon.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/nifmon.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index 767f8d701dce..1dad89e4cb2c 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
*** 993 LINES SKIPPED ***