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

49 files changed, 131 insertions, 124 deletions

diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 65484f3d3fb5..a94ab97b00bf 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	spim
 PORTVERSION=	8.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://pages.cs.wisc.edu/~larus/SPIM/
 
@@ -16,14 +17,14 @@ ALL_TARGET=	${PORTNAME}
 
 PORTDOCS=	cycle.ps.gz spim.ps.gz SPIM.html
 PLIST_FILES=	bin/spim %%DATADIR%%/exceptions.s \
-		man/man1/spim.1.gz
+		share/man/man1/spim.1.gz
 
 OPTIONS_DEFINE=	GUI DOCS
 OPTIONS_DEFAULT=GUI
 
 GUI_USE=	XORG=x11,xaw
 GUI_USES=	imake:env xorg
-GUI_PLIST_FILES=bin/xspim man/man1/xspim.1.gz
+GUI_PLIST_FILES=bin/xspim share/man/man1/xspim.1.gz
 
 post-build-GUI-on:
 	@(cd ${WRKSRC}/xspim && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS} && \
@@ -31,13 +32,13 @@ post-build-GUI-on:
 
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/spim ${STAGEDIR}${PREFIX}/bin/spim
-	${INSTALL_MAN} ${WRKSRC}/Documentation/spim.man ${STAGEDIR}${MANPREFIX}/man/man1/spim.1
+	${INSTALL_MAN} ${WRKSRC}/Documentation/spim.man ${STAGEDIR}${PREFIX}/share/man/man1/spim.1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/CPU/exceptions.s ${STAGEDIR}${DATADIR}/exceptions.s
 
 do-install-GUI-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/xspim/xspim ${STAGEDIR}${PREFIX}/bin/xspim
-	${INSTALL_MAN} ${WRKSRC}/Documentation/xspim.man ${STAGEDIR}${MANPREFIX}/man/man1/xspim.1
+	${INSTALL_MAN} ${WRKSRC}/Documentation/xspim.man ${STAGEDIR}${PREFIX}/share/man/man1/xspim.1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/ftp/bbftp-client/Makefile b/ftp/bbftp-client/Makefile
index 45b8a354d8fe..7e0ac69479fc 100644
--- a/ftp/bbftp-client/Makefile
+++ b/ftp/bbftp-client/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bbftp-client
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	http://software.in2p3.fr/bbftp/dist/ \
 		ftp://ftp.in2p3.fr/pub/bbftp/
@@ -24,7 +25,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bbftp ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/../doc/bbftp.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/ftp/bbftp-client/pkg-plist b/ftp/bbftp-client/pkg-plist
index 2f84af8cb402..4e8bec5f748c 100644
--- a/ftp/bbftp-client/pkg-plist
+++ b/ftp/bbftp-client/pkg-plist
@@ -1,5 +1,5 @@
 bin/bbftp
-man/man1/bbftp.1.gz
+share/man/man1/bbftp.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
diff --git a/ftp/bbftp-server/Makefile b/ftp/bbftp-server/Makefile
index cfb3d3763eed..8b9122ebff14 100644
--- a/ftp/bbftp-server/Makefile
+++ b/ftp/bbftp-server/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bbftp-server
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	http://software.in2p3.fr/bbftp/dist/ \
 		ftp://ftp.in2p3.fr/pub/bbftp/
@@ -27,7 +28,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bbftpd ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/../doc/bbftpd.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/ftp/bbftp-server/pkg-plist b/ftp/bbftp-server/pkg-plist
index 1fe21777fb0d..ce938c9adb36 100644
--- a/ftp/bbftp-server/pkg-plist
+++ b/ftp/bbftp-server/pkg-plist
@@ -1,5 +1,5 @@
 bin/bbftpd
-man/man1/bbftpd.1.gz
+share/man/man1/bbftpd.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
diff --git a/ftp/ftpsesame/Makefile b/ftp/ftpsesame/Makefile
index 6f719f08d06d..66048aa12c75 100644
--- a/ftp/ftpsesame/Makefile
+++ b/ftp/ftpsesame/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ftpsesame
 PORTVERSION=	0.95
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.sentia.org/downloads/ \
 		LOCAL/sem
@@ -10,13 +11,13 @@ WWW=		https://www.sentia.org/projects/ftpsesame/
 
 LICENSE=	ISCL
 
-PLIST_FILES=	bin/ftpsesame man/man8/ftpsesame.8.gz
+PLIST_FILES=	bin/ftpsesame share/man/man8/ftpsesame.8.gz
 USE_RC_SUBR=	ftpsesame
 
-MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX} MANPREFIX=${STAGEDIR}${MANPREFIX}
+MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX} MANPREFIX=${STAGEDIR}${PREFIX}/share
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ftpsesame ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ftpsesame.8 ${STAGEDIR}${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/ftpsesame.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/ftp/hsftp/Makefile b/ftp/hsftp/Makefile
index 33cdd6cb0ebc..77598de637c5 100644
--- a/ftp/hsftp/Makefile
+++ b/ftp/hsftp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hsftp
 PORTVERSION=	1.15
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	ftp
 MASTER_SITES=	http://la-samhna.de/hsftp/ \
 		http://www.alaskaparadise.com/freebsd/
@@ -19,7 +19,7 @@ READLINE_DESC=	Enable readline support
 GNU_CONFIGURE=	yes
 MAKEFILE=	makefile
 
-PLIST_FILES=	bin/hsftp man/man1/hsftp.1.gz
+PLIST_FILES=	bin/hsftp share/man/man1/hsftp.1.gz
 
 OPENSSH_RUN_DEPENDS=		ssh:security/openssh-portable
 OPENSSH_CONFIGURE_WITH=		openssh
@@ -32,6 +32,6 @@ pre-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hsftp ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/hsftp.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/hsftp.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index 7e8f0778feab..dceb479f72d0 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ncftp
 PORTVERSION=	3.2.6
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.ncftp.com/ncftp/
@@ -39,8 +39,8 @@ pre-build-LIBS-on:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf ncftpbatch ${STAGEDIR}${PREFIX}/bin/ncftpspooler
-	${INSTALL_MAN} ${WRKSRC}/doc/man/* ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/Strn/Strn.3 ${STAGEDIR}${MANPREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/doc/man/* ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/Strn/Strn.3 ${STAGEDIR}${PREFIX}/share/man/man3
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/ftp/ncftp3/pkg-plist b/ftp/ncftp3/pkg-plist
index f9d3c9dea56b..7d3179ccb9a1 100644
--- a/ftp/ncftp3/pkg-plist
+++ b/ftp/ncftp3/pkg-plist
@@ -5,16 +5,16 @@ bin/ncftpget
 bin/ncftpls
 bin/ncftpput
 bin/ncftpspooler
-man/man1/ncftp.1.gz
-man/man1/ncftpbatch.1.gz
-man/man1/ncftpget.1.gz
-man/man1/ncftpls.1.gz
-man/man1/ncftpput.1.gz
-man/man1/ncftpspooler.1.gz
+share/man/man1/ncftp.1.gz
+share/man/man1/ncftpbatch.1.gz
+share/man/man1/ncftpget.1.gz
+share/man/man1/ncftpls.1.gz
+share/man/man1/ncftpput.1.gz
+share/man/man1/ncftpspooler.1.gz
 %%LIBS%%lib/libStrn.so
 %%LIBS%%lib/libStrn.so.1
 %%LIBS%%lib/libncftp.so
 %%LIBS%%lib/libncftp.so.3
 %%LIBS%%lib/libsio.so
 %%LIBS%%lib/libsio.so.5
-%%LIBS%%man/man3/Strn.3.gz
+%%LIBS%%share/man/man3/Strn.3.gz
diff --git a/ftp/oftpd/Makefile b/ftp/oftpd/Makefile
index 7bcd7b2b5cfa..bb573938a771 100644
--- a/ftp/oftpd/Makefile
+++ b/ftp/oftpd/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	oftpd
 PORTVERSION=	0.3.7
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.time-travellers.org/oftpd/ \
 		http://atreides.freenix.no/~anders/
@@ -16,7 +17,7 @@ USES=		cpe
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	README AUTHORS ChangeLog NEWS TODO BUGS
-PLIST_FILES=	sbin/oftpd man/man8/oftpd.8.gz
+PLIST_FILES=	sbin/oftpd share/man/man8/oftpd.8.gz
 
 OPTIONS_DEFINE=	DOCS
 
@@ -28,7 +29,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/oftpd ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/man/oftpd.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/man/oftpd.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/ftp/pftpd/Makefile b/ftp/pftpd/Makefile
index 1d3637aaa7dc..4a0f14cc57f5 100644
--- a/ftp/pftpd/Makefile
+++ b/ftp/pftpd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pftpd
 PORTVERSION=	1.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.ifm.liu.se/pub/unix/pftpd/
 
@@ -12,12 +12,12 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	sbin/pftpd \
-		man/man1/pftpd.1.gz \
-		man/man1/rpad.1.gz
+		share/man/man1/pftpd.1.gz \
+		share/man/man1/rpad.1.gz
 
 do-install:
 	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} pftpd ${STAGEDIR}${PREFIX}/sbin)
-	(cd ${WRKSRC}/doc && ${INSTALL_MAN} *.1 ${STAGEDIR}${MANPREFIX}/man/man1)
+	(cd ${WRKSRC}/doc && ${INSTALL_MAN} *.1 ${STAGEDIR}${PREFIX}/share/man/man1)
 	@${CAT} ${WRKSRC}/ISSUES
 
 .include <bsd.port.mk>
diff --git a/ftp/twoftpd/Makefile b/ftp/twoftpd/Makefile
index d91e670d7d5f..799a98b7d2d9 100644
--- a/ftp/twoftpd/Makefile
+++ b/ftp/twoftpd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	twoftpd
 PORTVERSION=	1.43
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/archive/
 
@@ -26,8 +26,9 @@ PLIST_FILES=	bin/twoftpd-anon bin/twoftpd-anon-conf \
 		bin/twoftpd-auth bin/twoftpd-bind-port \
 		bin/twoftpd-conf bin/twoftpd-drop \
 		bin/twoftpd-switch bin/twoftpd-xfer \
-		man/man1/twoftpd-auth.1.gz man/man1/twoftpd-switch.1.gz \
-		man/man1/twoftpd-xfer.1.gz
+		share/man/man1/twoftpd-auth.1.gz \
+		share/man/man1/twoftpd-switch.1.gz \
+		share/man/man1/twoftpd-xfer.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
@@ -36,7 +37,7 @@ post-patch:
 
 do-configure:
 	@${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
-	@${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man
+	@${ECHO_CMD} "${PREFIX}/share/man" > ${WRKSRC}/conf-man
 	@${ECHO_CMD} "${CC} ${CFLAGS} ${CPPFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} "${BGLIBS_INCLUDE}" > ${WRKSRC}/conf-bgincs
@@ -48,7 +49,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 .for f in twoftpd-auth.1 twoftpd-switch.1 twoftpd-xfer.1
-	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/share/man/man1/
 .endfor
 
 do-install-DOCS-on:
diff --git a/games/bsp/Makefile b/games/bsp/Makefile
index 77d4a48460be..b1972319c565 100644
--- a/games/bsp/Makefile
+++ b/games/bsp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bsp
 PORTVERSION=	5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://games.moria.org.uk/doom/bsp/download/ \
 		http://files.kyle-evans.net/freebsd/
@@ -22,7 +23,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bsp ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/bsp.6 ${STAGEDIR}${MANPREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/bsp.6 ${STAGEDIR}${PREFIX}/share/man/man6
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/games/bsp/pkg-plist b/games/bsp/pkg-plist
index a9fb0b16cc9c..de607a9f5db9 100644
--- a/games/bsp/pkg-plist
+++ b/games/bsp/pkg-plist
@@ -1,3 +1,3 @@
 bin/bsp
-man/man6/bsp.6.gz
+share/man/man6/bsp.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/games/editss/Makefile b/games/editss/Makefile
index 5953327ccacb..d351886a4152 100644
--- a/games/editss/Makefile
+++ b/games/editss/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	editss
 PORTVERSION=	2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/jylefort
 
@@ -25,6 +25,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/editss ${STAGEDIR}${PREFIX}/libexec
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/editssrc ${WRKSRC}/ships ${STAGEDIR}${DATADIR}
-	${INSTALL_MAN} ${WRKSRC}/editss.6 ${STAGEDIR}${MANPREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/editss.6 ${STAGEDIR}${PREFIX}/share/man/man6
 
 .include <bsd.port.mk>
diff --git a/games/editss/pkg-plist b/games/editss/pkg-plist
index 67a681cc2998..89f073b9ffbc 100644
--- a/games/editss/pkg-plist
+++ b/games/editss/pkg-plist
@@ -1,5 +1,5 @@
 bin/editss
 libexec/editss
-man/man6/editss.6.gz
+share/man/man6/editss.6.gz
 %%DATADIR%%/editssrc
 %%DATADIR%%/ships
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index 02756a292d05..10efc73ab93b 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fkiss
 PORTVERSION=	0.33a
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	http://www2s.biglobe.ne.jp/~yav/soft/fkiss/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/a//}
@@ -28,7 +28,7 @@ GNU_CONFIGURE=	yes
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
 
-PLIST_FILES=	bin/fkiss man/man1/fkiss.1.gz
+PLIST_FILES=	bin/fkiss share/man/man1/fkiss.1.gz
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
@@ -43,7 +43,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fkiss ${STAGEDIR}${PREFIX}/bin/fkiss
 	${INSTALL_MAN} ${WRKSRC}/fkiss.man \
-		${STAGEDIR}${MANPREFIX}/man/man1/fkiss.1
+		${STAGEDIR}${PREFIX}/share/man/man1/fkiss.1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/games/gnushogi/Makefile b/games/gnushogi/Makefile
index e8e15367894f..ec5da7c0df06 100644
--- a/games/gnushogi/Makefile
+++ b/games/gnushogi/Makefile
@@ -32,7 +32,7 @@ pre-build-INFO-on:
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/gnushogi/gnushogi ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/doc/gnushogi.6 ${STAGEDIR}${MANPREFIX}/man/man6
+	@${INSTALL_MAN} ${WRKSRC}/doc/gnushogi.6 ${STAGEDIR}${PREFIX}/share/man/man6
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/gnushogi/gnushogi.bbk ${STAGEDIR}${DATADIR}
 
diff --git a/games/gnushogi/pkg-plist b/games/gnushogi/pkg-plist
index 6d4aeab281ab..18f2f522b45c 100644
--- a/games/gnushogi/pkg-plist
+++ b/games/gnushogi/pkg-plist
@@ -1,5 +1,5 @@
 bin/gnushogi
-man/man6/gnushogi.6.gz
+share/man/man6/gnushogi.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/BOOKFILES
 %%PORTDOCS%%%%DOCSDIR%%/PORTING
 %%PORTDOCS%%%%DOCSDIR%%/shogi.rules
diff --git a/games/jzip/Makefile b/games/jzip/Makefile
index d2dcb245ff92..3b8edb3bd469 100644
--- a/games/jzip/Makefile
+++ b/games/jzip/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	jzip
 PORTVERSION=	2.0.1g
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/mph
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
@@ -14,7 +15,7 @@ USES=		ncurses zip
 CPPFLAGS+=	-DPOSIX -DHAVE_GETOPT
 
 PORTDOCS=	Jzip.doc
-PLIST_FILES=	bin/jzip man/man1/jzip.1.gz
+PLIST_FILES=	bin/jzip share/man/man1/jzip.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
@@ -30,7 +31,7 @@ post-patch:
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} jzip ${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC} && ${INSTALL_DATA} jzip.1 ${STAGEDIR}${MANPREFIX}/man/man1)
+	(cd ${WRKSRC} && ${INSTALL_DATA} jzip.1 ${STAGEDIR}${PREFIX}/share/man/man1)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} Jzip.doc ${STAGEDIR}${DOCSDIR})
 
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index bc41980b8b95..4dab5f849d6c 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nighthawk
 PORTVERSION=	3.0.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SUNSITE/games/arcade
 
@@ -30,7 +30,7 @@ do-install:
 	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} nighthawk \
 		${STAGEDIR}${PREFIX}/bin)
 	(cd ${WRKSRC}/doc &&  ${INSTALL_MAN} nighthawk.6 \
-		${STAGEDIR}${MANPREFIX}/man/man6)
+		${STAGEDIR}${PREFIX}/share/man/man6)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${TAR} -C ${WRKSRC} --exclude ".xvpics" -cf - data | \
 		${TAR} -C ${STAGEDIR}${DATADIR} --unlink -xf -
diff --git a/games/nighthawk/pkg-plist b/games/nighthawk/pkg-plist
index c21bb523f46b..9698d720f01f 100644
--- a/games/nighthawk/pkg-plist
+++ b/games/nighthawk/pkg-plist
@@ -1,5 +1,5 @@
 @(root,games,6755) bin/nighthawk
-man/man6/nighthawk.6.gz
+share/man/man6/nighthawk.6.gz
 %%DATADIR%%/data/Anoyle/Bridge.f
 %%DATADIR%%/data/Anoyle/Bridge.m
 %%DATADIR%%/data/Anoyle/Engineering.f
@@ -200,4 +200,4 @@ man/man6/nighthawk.6.gz
 %%DATADIR%%/data/xpm/standard/ship_complete.xpm
 %%DATADIR%%/data/xpm/standard/trans_terminated.xpm
 %%DATADIR%%/data/xpm/xpm.i
-@unexec if [ ! -s /var/games/nighthawk.scores ]; then rm -f /var/games/nighthawk.scores; fi
+@rmempty /var/games/nighthawk.scores
diff --git a/games/oldrunner/Makefile b/games/oldrunner/Makefile
index 0358ac834e5b..4aa8f504e342 100644
--- a/games/oldrunner/Makefile
+++ b/games/oldrunner/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	oldrunner
 PORTVERSION=	20120131
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/culot
 
@@ -15,7 +16,7 @@ MAKEFILE=	GNUmakefile
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-PLIST_FILES=	bin/oldrunner ${DATADIR_REL}/original.lvl man/man6/oldrunner.6.gz
+PLIST_FILES=	bin/oldrunner ${DATADIR_REL}/original.lvl share/man/man6/oldrunner.6.gz
 PLIST_DIRS=	${DATADIR_REL}
 
 post-patch:
@@ -26,6 +27,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/oldrunner ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/levels/original.lvl ${STAGEDIR}${DATADIR}
-	${INSTALL_MAN} ${WRKSRC}/oldrunner.6 ${STAGEDIR}${MANPREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/oldrunner.6 ${STAGEDIR}${PREFIX}/share/man/man6
 
 .include <bsd.port.mk>
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 2c48e26c97f1..a654001cdd57 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -102,7 +102,7 @@ post-build-CLIENTS-on:
 .endfor
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/man/quakeforge.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man/quakeforge.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 post-install-CLIENTS-on:
 	@(cd ${WRKDIR} && ${COPYTREE_SHARE} icons \
diff --git a/games/quakeforge/pkg-plist b/games/quakeforge/pkg-plist
index 7197a04420ba..7ddde35abcc4 100644
--- a/games/quakeforge/pkg-plist
+++ b/games/quakeforge/pkg-plist
@@ -176,13 +176,13 @@ lib/libQFutil.so.1.0.0
 %%CLIENTS%%lib/quakeforge/plugins/vid_render_sw32.so
 libdata/pkgconfig/qfcc.pc
 libdata/pkgconfig/quakeforge.pc
-man/man1/pak.1.gz
-man/man1/qfcc.1.gz
-man/man1/qflight.1.gz
-man/man1/qfvis.1.gz
-man/man1/quakeforge.1.gz
-man/man1/wad.1.gz
-man/man1/zpak.1.gz
+share/man/man1/pak.1.gz
+share/man/man1/qfcc.1.gz
+share/man/man1/qflight.1.gz
+share/man/man1/qfvis.1.gz
+share/man/man1/quakeforge.1.gz
+share/man/man1/wad.1.gz
+share/man/man1/zpak.1.gz
 %%CLIENTS%%%%SDL%%share/applications/quakeforge-nq-sdl.desktop
 %%CLIENTS%%share/applications/quakeforge-nq-x11.desktop
 %%CLIENTS%%%%SDL%%share/applications/quakeforge-qw-sdl.desktop
diff --git a/games/retroarch/Makefile b/games/retroarch/Makefile
index e7cf1b4dd8af..f3e8b8e33e65 100644
--- a/games/retroarch/Makefile
+++ b/games/retroarch/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	RetroArch
 DISTVERSION=	1.16.0.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games emulators
 
@@ -29,7 +30,7 @@ SHEBANG_FILES=	libretro-common/glsym/glgen.py libretro-common/glsym/rglgen.py \
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-threads --disable-discord \
 		--sysconfdir=${LOCALBASE}/etc
-CONFIGURE_ENV+=	MAN_DIR=${MANPREFIX}/man
+CONFIGURE_ENV+=	MAN_DIR=${PREFIX}/share/man
 LDFLAGS_i386=	-Wl,-znotext
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:tl}
diff --git a/games/retroarch/pkg-plist b/games/retroarch/pkg-plist
index ef62ae1ee8fe..304d493b70d4 100644
--- a/games/retroarch/pkg-plist
+++ b/games/retroarch/pkg-plist
@@ -1,8 +1,8 @@
 bin/retroarch
 bin/retroarch-cg2glsl
 etc/retroarch.cfg
-man/man6/retroarch-cg2glsl.6.gz
-man/man6/retroarch.6.gz
+share/man/man6/retroarch-cg2glsl.6.gz
+share/man/man6/retroarch.6.gz
 share/applications/retroarch.desktop
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/games/unnethack/Makefile b/games/unnethack/Makefile
index 1b5331f007d0..81cb339e5908 100644
--- a/games/unnethack/Makefile
+++ b/games/unnethack/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	unnethack
 DISTVERSION=	5.1.0-20131208
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
 
@@ -26,7 +26,7 @@ CONFIGURE_ARGS=	--datadir="${DATADIR:H}" \
 		--with-group=no \
 		--enable-data-librarian \
 		LFLAGS="${LDFLAGS}"
-MAKE_ARGS=	MANPREFIX="${STAGEDIR}${MANPREFIX}"
+MAKE_ARGS=	MANPREFIX="${STAGEDIR}${PREFIX}/share"
 INSTALL_TARGET=	install manpages
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-deinstall
@@ -39,7 +39,7 @@ post-patch:
 	${MV} ${WRKSRC}/doc/nethack.6 ${WRKSRC}/doc/${PORTNAME}.6
 
 post-install:
-	cd ${STAGEDIR}${PREFIX}/man/man6; \
+	cd ${STAGEDIR}${PREFIX}/share/man/man6; \
 	for f in ${WRKSRC}/doc/*.6; do \
 		fn=$${f##*/}; \
 		case $$fn in \
diff --git a/games/unnethack/pkg-plist b/games/unnethack/pkg-plist
index 5e6e0d8df027..e941d9e1c8ca 100644
--- a/games/unnethack/pkg-plist
+++ b/games/unnethack/pkg-plist
@@ -15,11 +15,11 @@ bin/unnethack
 @owner
 @group
 @mode
-man/man6/unnethack_dgn_comp.6.gz
-man/man6/unnethack_dlb.6.gz
-man/man6/unnethack_lev_comp.6.gz
-man/man6/unnethack_recover.6.gz
-man/man6/unnethack.6.gz
+share/man/man6/unnethack_dgn_comp.6.gz
+share/man/man6/unnethack_dlb.6.gz
+share/man/man6/unnethack_lev_comp.6.gz
+share/man/man6/unnethack_recover.6.gz
+share/man/man6/unnethack.6.gz
 %%DOCSDIR%%/Guidebook.txt
 %%DOCSDIR%%/license
 %%PORTDOCS%%%%DOCSDIR%%/sample.unnethackrc
diff --git a/games/xbl/Makefile b/games/xbl/Makefile
index ed882d43e96e..89df36f9bfd3 100644
--- a/games/xbl/Makefile
+++ b/games/xbl/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xbl
 PORTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://perso.univ-lyon1.fr/thierry.excoffier/XBL/
 
@@ -19,7 +20,7 @@ MAKE_ARGS=	USE_SETGID="" \
 		RESOURCEDIR="${PREFIX}/lib/X11/app-defaults" \
 		BINDIR="${PREFIX}/bin" \
 		SCOREDIR="${PREFIX}/lib/X11/xbl" \
-		MANPATH="${MANPREFIX}/man" \
+		MANPATH="${PREFIX}/share/man" \
 		LIBS="-lm -lX11" \
 		LDOPTIONS="${LDFLAGS}"
 
@@ -32,7 +33,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bl ${STAGEDIR}${PREFIX}/bin/xbl
-	${INSTALL_MAN} ${WRKSRC}/xbl.man ${STAGEDIR}${MANPREFIX}/man/man1/xbl.1
+	${INSTALL_MAN} ${WRKSRC}/xbl.man ${STAGEDIR}${PREFIX}/share/man/man1/xbl.1
 	${INSTALL_DATA} ${WRKSRC}/Xbl.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Xbl
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xbl
 	${INSTALL_DATA} ${WRKSRC}/Xbl.ad ${STAGEDIR}${PREFIX}/lib/X11/xbl/Xbl
diff --git a/games/xbl/pkg-plist b/games/xbl/pkg-plist
index 3adcc684bbab..33c1d714861e 100644
--- a/games/xbl/pkg-plist
+++ b/games/xbl/pkg-plist
@@ -1,5 +1,5 @@
 bin/xbl
-man/man1/xbl.1.gz
+share/man/man1/xbl.1.gz
 lib/X11/app-defaults/Xbl
 lib/X11/xbl/Xbl
 lib/X11/xbl/xbl-game.gif
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 62a70ae7d65a..17114f4d8851 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xbomb
 PORTVERSION=	2.2b
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.gedanken.org.uk/software/xbomb/download/
 
@@ -20,7 +21,7 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xbomb ${STAGEDIR}${PREFIX}/bin/xbomb
-	${INSTALL_MAN} ${WRKSRC}/xbomb.6 ${STAGEDIR}${MANPREFIX}/man/man6/xbomb.6
+	${INSTALL_MAN} ${WRKSRC}/xbomb.6 ${STAGEDIR}${PREFIX}/share/man/man6/xbomb.6
 	${INSTALL_DATA} ${WRKSRC}/xbomb.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XBomb
 	@${MKDIR} ${STAGEDIR}/var/games/xbomb
 	@${TOUCH} ${STAGEDIR}/var/games/xbomb/xbomb3.hi.sample
diff --git a/games/xbomb/pkg-plist b/games/xbomb/pkg-plist
index 8a256261c27d..e8d683a2ef0f 100644
--- a/games/xbomb/pkg-plist
+++ b/games/xbomb/pkg-plist
@@ -1,5 +1,5 @@
 @(,games,2755) bin/xbomb
-man/man6/xbomb.6.gz
+share/man/man6/xbomb.6.gz
 lib/X11/app-defaults/XBomb
 @sample(,games,664) /var/games/xbomb/xbomb3.hi.sample
 @sample(,games,664) /var/games/xbomb/xbomb4.hi.sample
diff --git a/games/xcubes/Makefile b/games/xcubes/Makefile
index 7f0df39e0a16..d4ebcabf15c3 100644
--- a/games/xcubes/Makefile
+++ b/games/xcubes/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xcubes
 PORTVERSION=	5.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games/xpuzzles
 
@@ -13,12 +13,12 @@ USES=		imake xorg
 USE_XORG=	x11 xext xt sm ice
 
 PLIST_FILES=	bin/xcubes \
-		man/man1/xcubes.1.gz \
+		share/man/man1/xcubes.1.gz \
 		lib/X11/app-defaults/Cubes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xcubes ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Cubes.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Cubes
-	${INSTALL_MAN} ${WRKSRC}/xcubes.man ${STAGEDIR}${MANPREFIX}/man/man1/xcubes.1
+	${INSTALL_MAN} ${WRKSRC}/xcubes.man ${STAGEDIR}${PREFIX}/share/man/man1/xcubes.1
 
 .include <bsd.port.mk>
diff --git a/games/xdino/Makefile b/games/xdino/Makefile
index 5390d05e26b8..7ea9f2463327 100644
--- a/games/xdino/Makefile
+++ b/games/xdino/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xdino
 PORTVERSION=	5.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games/xpuzzles
 
@@ -13,12 +13,12 @@ USES=		imake xorg
 USE_XORG=	x11 xext xt sm ice
 
 PLIST_FILES=	bin/xdino \
-		man/man1/xdino.1.gz \
+		share/man/man1/xdino.1.gz \
 		lib/X11/app-defaults/Dino
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdino ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Dino.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Dino
-	${INSTALL_MAN} ${WRKSRC}/xdino.man ${STAGEDIR}${MANPREFIX}/man/man1/xdino.1
+	${INSTALL_MAN} ${WRKSRC}/xdino.man ${STAGEDIR}${PREFIX}/share/man/man1/xdino.1
 
 .include <bsd.port.mk>
diff --git a/games/xmball/Makefile b/games/xmball/Makefile
index 00484827ca87..eceab3114f9e 100644
--- a/games/xmball/Makefile
+++ b/games/xmball/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xmball
 PORTVERSION=	5.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games/xpuzzles
 
@@ -13,12 +13,12 @@ USES=		imake xorg
 USE_XORG=	x11 xext xt sm ice
 
 PLIST_FILES=	bin/xmball \
-		man/man1/xmball.1.gz \
+		share/man/man1/xmball.1.gz \
 		lib/X11/app-defaults/Mball
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmball ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Mball.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Mball
-	${INSTALL_MAN} ${WRKSRC}/xmball.man ${STAGEDIR}${MANPREFIX}/man/man1/xmball.1
+	${INSTALL_MAN} ${WRKSRC}/xmball.man ${STAGEDIR}${PREFIX}/share/man/man1/xmball.1
 
 .include <bsd.port.mk>
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index 16ce68a7d218..387e315fcda3 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xmille
 PORTVERSION=	2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games
 DISTNAME=	${PORTNAME}
@@ -19,7 +19,7 @@ CFLAGS+=	-Wno-error=return-type
 
 WRKSRC=		${WRKDIR}/Mille
 
-PLIST_FILES=	bin/xmille man/man1/xmille.1.gz
+PLIST_FILES=	bin/xmille share/man/man1/xmille.1.gz
 
 .include <bsd.port.options.mk>
 
@@ -32,6 +32,6 @@ post-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmille ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xmille.man ${STAGEDIR}${MANPREFIX}/man/man1/xmille.1
+	${INSTALL_MAN} ${WRKSRC}/xmille.man ${STAGEDIR}${PREFIX}/share/man/man1/xmille.1
 
 .include <bsd.port.mk>
diff --git a/games/xmlink/Makefile b/games/xmlink/Makefile
index 0689d367c63e..1592444d6e4c 100644
--- a/games/xmlink/Makefile
+++ b/games/xmlink/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xmlink
 PORTVERSION=	5.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games/xpuzzles
 
@@ -13,12 +13,12 @@ USES=		imake xorg
 USE_XORG=	x11 xext xt sm ice
 
 PLIST_FILES=	bin/xmlink \
-		man/man1/xmlink.1.gz \
+		share/man/man1/xmlink.1.gz \
 		lib/X11/app-defaults/Mlink
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmlink ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Mlink.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Mlink
-	${INSTALL_MAN} ${WRKSRC}/xmlink.man ${STAGEDIR}${MANPREFIX}/man/man1/xmlink.1
+	${INSTALL_MAN} ${WRKSRC}/xmlink.man ${STAGEDIR}${PREFIX}/share/man/man1/xmlink.1
 
 .include <bsd.port.mk>
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index 46c03bbaa6cc..6106d17fa2b1 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xmris
 PORTVERSION=	4.04
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -25,9 +25,9 @@ do-install:
 	${LN} -sf xmris ${STAGEDIR}${PREFIX}/bin/xmsit
 .for i in xmred xmris
 	(cd ${WRKSRC} && ${INSTALL_MAN} ${i}.man \
-		${STAGEDIR}${MANPREFIX}/man/man6/${i}.6)
+		${STAGEDIR}${PREFIX}/share/man/man6/${i}.6)
 .endfor
-	${LN} -sf xmris.6 ${STAGEDIR}${MANPREFIX}/man/man6/xmsit.6
+	${LN} -sf xmris.6 ${STAGEDIR}${PREFIX}/share/man/man6/xmsit.6
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
 	(cd ${WRKSRC} && ${INSTALL_DATA} Xmris \
 		${STAGEDIR}${PREFIX}/lib/X11/app-defaults)
diff --git a/games/xmris/pkg-plist b/games/xmris/pkg-plist
index 712906f523ed..3e5a9db04c32 100644
--- a/games/xmris/pkg-plist
+++ b/games/xmris/pkg-plist
@@ -1,9 +1,9 @@
 @(,games,2555) bin/xmris
 @(,games,2555) bin/xmsit
 @(,games,2555) bin/xmred
-man/man6/xmred.6.gz
-man/man6/xmris.6.gz
-man/man6/xmsit.6.gz
+share/man/man6/xmred.6.gz
+share/man/man6/xmris.6.gz
+share/man/man6/xmsit.6.gz
 lib/X11/app-defaults/Xmris
 lib/X11/xmris/alphabet.gdn
 lib/X11/xmris/digits.gdn
diff --git a/games/xoct/Makefile b/games/xoct/Makefile
index 90a2d7d94721..0c1a19ffeb52 100644
--- a/games/xoct/Makefile
+++ b/games/xoct/Makefile
@@ -14,11 +14,11 @@ USE_XORG=	x11 xext xt sm ice
 
 PLIST_FILES=	bin/xoct \
 		lib/X11/app-defaults/Oct \
-		man/man1/xoct.1.gz
+		share/man/man1/xoct.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xoct ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Oct.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Oct
-	${INSTALL_MAN} ${WRKSRC}/xoct.man ${STAGEDIR}${MANPREFIX}/man/man1/xoct.1
+	${INSTALL_MAN} ${WRKSRC}/xoct.man ${STAGEDIR}${PREFIX}/share/man/man1/xoct.1
 
 .include <bsd.port.mk>
diff --git a/games/xpanex/Makefile b/games/xpanex/Makefile
index c383b21542aa..967d1e8d07a1 100644
--- a/games/xpanex/Makefile
+++ b/games/xpanex/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xpanex
 PORTVERSION=	5.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games/xpuzzles
 
@@ -13,12 +13,12 @@ USES=		imake xorg
 USE_XORG=	x11 xext xt sm ice
 
 PLIST_FILES=	bin/xpanex \
-		man/man1/xpanex.1.gz \
+		share/man/man1/xpanex.1.gz \
 		lib/X11/app-defaults/Panex
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xpanex ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Panex.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Panex
-	${INSTALL_MAN} ${WRKSRC}/xpanex.man ${STAGEDIR}${MANPREFIX}/man/man1/xpanex.1
+	${INSTALL_MAN} ${WRKSRC}/xpanex.man ${STAGEDIR}${PREFIX}/share/man/man1/xpanex.1
 
 .include <bsd.port.mk>
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index a4cc591c6eee..3ec2d92d6c4c 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xpipeman
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SUNSITE/games/strategy
 DISTNAME=	${PORTNAME}
@@ -23,7 +23,7 @@ CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xpipeman ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${STAGEDIR}${MANPREFIX}/man/man6/xpipeman.6
+	${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${STAGEDIR}${PREFIX}/share/man/man6/xpipeman.6
 	${INSTALL} -c ${FILESDIR}/xpipescores ${STAGEDIR}${PREFIX}/lib/X11
 
 .include <bsd.port.mk>
diff --git a/games/xpipeman/pkg-plist b/games/xpipeman/pkg-plist
index 47941fafb002..9e00c627848c 100644
--- a/games/xpipeman/pkg-plist
+++ b/games/xpipeman/pkg-plist
@@ -1,9 +1,3 @@
-@group games
-@mode 2555
-bin/xpipeman
-@mode
-@mode 664
+@(,games,2555) bin/xpipeman
 lib/X11/xpipescores
-@mode
-@group
-man/man6/xpipeman.6.gz
+share/man/man6/xpipeman.6.gz
diff --git a/games/xpyraminx/Makefile b/games/xpyraminx/Makefile
index e92604c97988..0e813df25c11 100644
--- a/games/xpyraminx/Makefile
+++ b/games/xpyraminx/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xpyraminx
 PORTVERSION=	5.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games/xpuzzles
 
@@ -14,11 +14,11 @@ USE_XORG=	x11 xext xt sm ice
 
 PLIST_FILES=	bin/xpyraminx \
 		lib/X11/app-defaults/Pyraminx \
-		man/man1/xpyraminx.1.gz
+		share/man/man1/xpyraminx.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xpyraminx ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Pyraminx.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Pyraminx
-	${INSTALL_MAN} ${WRKSRC}/xpyraminx.man ${STAGEDIR}${MANPREFIX}/man/man1/xpyraminx.1
+	${INSTALL_MAN} ${WRKSRC}/xpyraminx.man ${STAGEDIR}${PREFIX}/share/man/man1/xpyraminx.1
 
 .include <bsd.port.mk>
diff --git a/games/xskewb/Makefile b/games/xskewb/Makefile
index 751011df709e..b9b9f5cac66c 100644
--- a/games/xskewb/Makefile
+++ b/games/xskewb/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xskewb
 PORTVERSION=	5.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games/xpuzzles
 
@@ -14,11 +14,11 @@ USE_XORG=	x11 xext xt sm ice
 
 PLIST_FILES=	bin/xskewb \
 		lib/X11/app-defaults/Skewb \
-		man/man1/xskewb.1.gz
+		share/man/man1/xskewb.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xskewb ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Skewb.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Skewb
-	${INSTALL_MAN} ${WRKSRC}/xskewb.man  ${STAGEDIR}${MANPREFIX}/man/man1/xskewb.1
+	${INSTALL_MAN} ${WRKSRC}/xskewb.man  ${STAGEDIR}${PREFIX}/share/man/man1/xskewb.1
 
 .include <bsd.port.mk>
diff --git a/games/xspringies/Makefile b/games/xspringies/Makefile
index 6461e1a1dd9d..d7e0afba77af 100644
--- a/games/xspringies/Makefile
+++ b/games/xspringies/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xspringies
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cis.upenn.edu/pub/dmd/xspringies/ \
 		http://www.cs.rutgers.edu/~decarlo/software/
@@ -26,7 +27,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xspringies ${STAGEDIR}${PREFIX}/bin/xspringies
-	${INSTALL_MAN} ${WRKSRC}/xspringies.man ${STAGEDIR}${MANPREFIX}/man/man1/xspringies.1
+	${INSTALL_MAN} ${WRKSRC}/xspringies.man ${STAGEDIR}${PREFIX}/share/man/man1/xspringies.1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xspringies
 	${INSTALL_DATA} ${WRKSRC}/lib/*.xsp ${STAGEDIR}${PREFIX}/lib/X11/xspringies
 
diff --git a/games/xspringies/pkg-plist b/games/xspringies/pkg-plist
index 0f8df8b47448..994fba9fb130 100644
--- a/games/xspringies/pkg-plist
+++ b/games/xspringies/pkg-plist
@@ -1,5 +1,5 @@
 bin/xspringies
-man/man1/xspringies.1.gz
+share/man/man1/xspringies.1.gz
 lib/X11/xspringies/2snake.xsp
 lib/X11/xspringies/2x2snake.xsp
 lib/X11/xspringies/3snake.xsp
diff --git a/games/xtriangles/Makefile b/games/xtriangles/Makefile
index 70e92664a8fd..011a6544956b 100644
--- a/games/xtriangles/Makefile
+++ b/games/xtriangles/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xtriangles
 PORTVERSION=	5.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games/xpuzzles
 
@@ -14,12 +14,12 @@ USE_XORG=	x11 xext xt sm ice
 
 PLIST_FILES=	bin/xtriangles \
 		lib/X11/app-defaults/Triangles \
-		man/man1/xtriangles.1.gz
+		share/man/man1/xtriangles.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xtriangles ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Triangles.ad \
 		 ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Triangles
-	${INSTALL_MAN} ${WRKSRC}/xtriangles.man ${STAGEDIR}${MANPREFIX}/man/man1/xtriangles.1
+	${INSTALL_MAN} ${WRKSRC}/xtriangles.man ${STAGEDIR}${PREFIX}/share/man/man1/xtriangles.1
 
 .include <bsd.port.mk>