11 files changed, 36 insertions, 31 deletions

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: