First pass at moving manpages to share/man for category a*

53 files changed, 115 insertions, 120 deletions

diff --git a/archivers/bzip/Makefile b/archivers/bzip/Makefile
index 04b23705cd01..2e22f7cde7de 100644
--- a/archivers/bzip/Makefile
+++ b/archivers/bzip/Makefile
@@ -17,8 +17,8 @@ RESTRICTED=	may be covered by patents
 USE_CSTD=	gnu89
 
 PLIST_FILES=	bin/bzip bin/bunzip \
-		man/man1/bunzip.1.gz \
-		man/man1/bzip.1.gz
+		share/man/man1/bunzip.1.gz \
+		share/man/man1/bzip.1.gz
 
 pre-install:
 	@${CAT} ${FILESDIR}/COPYRIGHT
@@ -27,8 +27,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bzip ${STAGEDIR}${PREFIX}/bin
 	${LN} -fs bzip ${STAGEDIR}${PREFIX}/bin/bunzip
 	${INSTALL_MAN} ${WRKSRC}/bzip.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1/bzip.1
+		${STAGEDIR}${PREFIX}/share/man/man1/bzip.1
 	${INSTALL_MAN} ${WRKSRC}/bzip.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1/bunzip.1
+		${STAGEDIR}${PREFIX}/share/man/man1/bunzip.1
 
 .include <bsd.port.mk>
diff --git a/archivers/lcab/Makefile b/archivers/lcab/Makefile
index a1bc16422025..f25745f326f7 100644
--- a/archivers/lcab/Makefile
+++ b/archivers/lcab/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
-PLIST_FILES=	bin/lcab man/man1/${PORTNAME}.1.gz
+PLIST_FILES=	bin/lcab share/man/man1/${PORTNAME}.1.gz
 
 pre-build:
 	@${REINPLACE_CMD} -e 's|1.0b11|1.0b12|' ${WRKSRC}/mytypes.h
@@ -25,6 +25,6 @@ pre-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/archivers/lha/files/patch-Makefile b/archivers/lha/files/patch-Makefile
index 94852941dba5..f333cc82c563 100644
--- a/archivers/lha/files/patch-Makefile
+++ b/archivers/lha/files/patch-Makefile
@@ -38,7 +38,7 @@
 +#MANSECT = n
 +PREFIX ?= /usr/local
 +BINDIR = ${PREFIX}/bin
-+MANDIR = ${PREFIX}/man/ja
++MANDIR = ${PREFIX}/share/man/ja
 +MANSECT = 1
  
 -INSTALL = install
diff --git a/archivers/liblz4/Makefile b/archivers/liblz4/Makefile
index df78cc9b18e3..ed4712041e16 100644
--- a/archivers/liblz4/Makefile
+++ b/archivers/liblz4/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 MAKE_ENV+=	TARGET_ARCH=
 MAKE_ARGS=	PREFIX="${PREFIX}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		MANDIR="${MAN1PREFIX}/man"
+		MANDIR="${PREFIX}/share/man"
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/archivers/liblz4/pkg-plist b/archivers/liblz4/pkg-plist
index 5753db3a7215..9b7308e7d257 100644
--- a/archivers/liblz4/pkg-plist
+++ b/archivers/liblz4/pkg-plist
@@ -11,7 +11,7 @@ lib/liblz4.so
 lib/liblz4.so.1
 lib/liblz4.so.%%PORTVERSION%%
 libdata/pkgconfig/liblz4.pc
-man/man1/lz4.1.gz
-man/man1/lz4c.1.gz
-man/man1/lz4cat.1.gz
-man/man1/unlz4.1.gz
+share/man/man1/lz4.1.gz
+share/man/man1/lz4c.1.gz
+share/man/man1/lz4cat.1.gz
+share/man/man1/unlz4.1.gz
diff --git a/archivers/liblzxcomp/files/Makefile.bsd b/archivers/liblzxcomp/files/Makefile.bsd
index e6ede132552d..e4cfde6ce978 100644
--- a/archivers/liblzxcomp/files/Makefile.bsd
+++ b/archivers/liblzxcomp/files/Makefile.bsd
@@ -13,6 +13,6 @@ LIBDIR=		${PREFIX}/lib
 INCLUDEDIR=	${PREFIX}/include
 
 MAN3=	lzxcomp.3
-MANDIR=	${PREFIX}/man/man
+MANDIR=	${PREFIX}/share/man/man
 
 .include <bsd.lib.mk>
diff --git a/archivers/liblzxcomp/pkg-plist b/archivers/liblzxcomp/pkg-plist
index 710dd695c0b8..ec8b7acbd367 100644
--- a/archivers/liblzxcomp/pkg-plist
+++ b/archivers/liblzxcomp/pkg-plist
@@ -4,4 +4,4 @@ lib/liblzxcomp.a
 @comment lib/liblzxcomp_p.a
 lib/liblzxcomp.so
 lib/liblzxcomp.so.1
-man/man3/lzxcomp.3.gz
+share/man/man3/lzxcomp.3.gz
diff --git a/archivers/mar/Makefile b/archivers/mar/Makefile
index 12296016fc39..a0990bf0325d 100644
--- a/archivers/mar/Makefile
+++ b/archivers/mar/Makefile
@@ -23,7 +23,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/man1/mar.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${STAGEDIR}${DOCSDIR}
 
diff --git a/archivers/mar/pkg-plist b/archivers/mar/pkg-plist
index f3b6702d9af8..a08b3913a54d 100644
--- a/archivers/mar/pkg-plist
+++ b/archivers/mar/pkg-plist
@@ -1,5 +1,5 @@
 bin/mar
-man/man1/mar.1.gz
+share/man/man1/mar.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/files.html
 %%PORTDOCS%%%%DOCSDIR%%/functions.html
diff --git a/archivers/mscompress/Makefile b/archivers/mscompress/Makefile
index 6f8461dec6b9..792319ab2e18 100644
--- a/archivers/mscompress/Makefile
+++ b/archivers/mscompress/Makefile
@@ -16,12 +16,13 @@ USES=		tar:bzip2
 HAS_CONFIGURE=	yes
 
 PLIST_FILES=	bin/mscompress bin/msexpand \
-		man/man1/mscompress.1.gz man/man1/msexpand.1.gz
+		share/man/man1/mscompress.1.gz \
+		share/man/man1/msexpand.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mscompress ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/msexpand ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mscompress.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/msexpand.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/mscompress.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/msexpand.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/archivers/nomarch/Makefile b/archivers/nomarch/Makefile
index 0132aba8e6aa..4e686e0cbba6 100644
--- a/archivers/nomarch/Makefile
+++ b/archivers/nomarch/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extracts files from the old '.arc' archive format
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-PLIST_FILES=	bin/nomarch man/man1/nomarch.1.gz
+PLIST_FILES=	bin/nomarch share/man/man1/nomarch.1.gz
 PORTDOCS=	COPYING ChangeLog NEWS README TODO
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
@@ -20,7 +20,7 @@ OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nomarch ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/nomarch.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/nomarch.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 7da9fd4ee1a8..917f88c9802d 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -61,7 +61,7 @@ do-install:
 	${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7zr
 
 	(cd ${WRKSRC}/man1 && \
-		${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1)
+		${INSTALL_MAN} 7z*.1 ${STAGEDIR}${PREFIX}/share/man/man1)
 
 do-install-DOCS-on:
 	(cd ${WRKSRC}/DOC && \
diff --git a/archivers/p7zip/pkg-plist b/archivers/p7zip/pkg-plist
index a8d5d9b8b600..db81af97aabc 100644
--- a/archivers/p7zip/pkg-plist
+++ b/archivers/p7zip/pkg-plist
@@ -6,6 +6,6 @@ libexec/p7zip/7z.so
 libexec/p7zip/7zCon.sfx
 libexec/p7zip/7za
 libexec/p7zip/7zr
-man/man1/7z.1.gz
-man/man1/7za.1.gz
-man/man1/7zr.1.gz
+share/man/man1/7z.1.gz
+share/man/man1/7za.1.gz
+share/man/man1/7zr.1.gz
diff --git a/archivers/par/Makefile b/archivers/par/Makefile
index b621d7b694cb..08fa4d5c5813 100644
--- a/archivers/par/Makefile
+++ b/archivers/par/Makefile
@@ -18,7 +18,7 @@ MAKEFILE=	Makefile.Linux
 MAKE_ARGS=	CC="${CC}"
 
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 PORTDOCS=	ChangeLog README
 
 OPTIONS_DEFINE=	DOCS
@@ -32,7 +32,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
diff --git a/archivers/pbzip2/Makefile b/archivers/pbzip2/Makefile
index 4bb4f418980f..9143db2e97be 100644
--- a/archivers/pbzip2/Makefile
+++ b/archivers/pbzip2/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSD4CLAUSE
 MAKE_ARGS=	CFLAGS="${CXXFLAGS}" CC="${CXX}"
 
 PLIST_FILES=	bin/pbzip2 bin/pbunzip2 \
-		man/man1/pbzip2.1.gz man/man1/pbunzip2.1.gz
+		share/man/man1/pbzip2.1.gz share/man/man1/pbunzip2.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,PRI[iu]MAX, & ,g' ${WRKSRC}/pbzip2.cpp \
@@ -26,7 +26,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/pbunzip2
-	${INSTALL_MAN} ${WRKSRC}/pbzip2.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
-	${LN} -sf pbzip2.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/pbunzip2.1
+	${INSTALL_MAN} ${WRKSRC}/pbzip2.1 ${STAGEDIR}${PREFIX}/share/man/man1/
+	${LN} -sf pbzip2.1 ${STAGEDIR}${PREFIX}/share/man/man1/pbunzip2.1
 
 .include <bsd.port.mk>
diff --git a/archivers/pigz/Makefile b/archivers/pigz/Makefile
index 9e91f4883dd0..d3e2b99d2e59 100644
--- a/archivers/pigz/Makefile
+++ b/archivers/pigz/Makefile
@@ -21,7 +21,7 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 LDFLAGS+=	-lz -lzopfli
 
 PLIST_FILES=	bin/pigz bin/pigzn bin/pigzt bin/unpigz
-PLIST_FILES+=	man/man1/pigz.1.gz
+PLIST_FILES+=	share/man/man1/pigz.1.gz
 
 post-patch:
 	${REINPLACE_CMD} -e 's/$${ZOPFLI}.*//' \
@@ -33,6 +33,6 @@ do-install:
 .for FILE in pigz pigzn pigzt unpigz
 	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/pigz.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/pigz.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/archivers/pxz/Makefile b/archivers/pxz/Makefile
index cecb32d15fc8..3617c5e6b241 100644
--- a/archivers/pxz/Makefile
+++ b/archivers/pxz/Makefile
@@ -17,10 +17,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		compiler:openmp tar:xz
-PLIST_FILES=	bin/pxz man/man1/pxz.1.gz
+PLIST_FILES=	bin/pxz share/man/man1/pxz.1.gz
 
 MAKE_ENV+=	BINDIR=${PREFIX}/bin \
-		MANDIR=${MANPREFIX}/man
+		MANDIR=${PREFIX}/share/man
 
 MAKE_ARGS+=	CC="${CC}"
 
diff --git a/archivers/py-bup/Makefile b/archivers/py-bup/Makefile
index 569f1babe2e5..5ff2a381e276 100644
--- a/archivers/py-bup/Makefile
+++ b/archivers/py-bup/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	bash:shells/bash git>=1.5.3.1:devel/git
 
 USES=		python:2.7 gmake
 
-PLIST_SUB=	MANDIR=${PREFIX}/man
+PLIST_SUB=	MANDIR=${PREFIX}/share/man
 
 OPTIONS_DEFINE=	TORNADO DOCS
 OPTIONS_DEFAULT=	DOC
@@ -35,10 +35,7 @@ TEST_TARGET=		test
 MAKE_ARGS=	PANDOC="${PANDOC}"
 USE_GITHUB=	yes
 
-.include <bsd.port.pre.mk>
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/bup/bup/*.so
-	test -z ${DOCS} || ${GZIP_CMD} ${STAGEDIR}${MANDIRS}/man1/bup*.1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/py-bup/files/patch-Makefile b/archivers/py-bup/files/patch-Makefile
index 34d058bab6b6..2b699a862c74 100644
--- a/archivers/py-bup/files/patch-Makefile
+++ b/archivers/py-bup/files/patch-Makefile
@@ -9,12 +9,3 @@
  CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
  SOEXT:=.so
  
-@@ -84,7 +84,7 @@ man_html := $(patsubst %.md,%.html,$(man_md))
- 
- INSTALL=install
- PREFIX=/usr/local
--MANDIR=$(PREFIX)/share/man
-+MANDIR=$(PREFIX)/man
- DOCDIR=$(PREFIX)/share/doc/bup
- BINDIR=$(PREFIX)/bin
- LIBDIR=$(PREFIX)/lib/bup
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 196625f4cf67..2d5eb3bf1c19 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -27,7 +27,7 @@ PORTDOCS=	README WHERE
 MANPAGES=	unzip.1 funzip.1 unzipsfx.1 zipgrep.1 zipinfo.1
 PLIST_FILES=	bin/unzip bin/funzip bin/unzipsfx bin/zipgrep \
 		bin/zipinfo
-PLIST_FILES+=	${MANPAGES:C|^(.*)\.([1-9])$|man/man\2/\1.\2.gz|}
+PLIST_FILES+=	${MANPAGES:C|^(.*)\.([1-9])$|share/man/man\2/\1.\2.gz|}
 
 LOCAL_UNZIP=	${CFLAGS} -DACORN_FTYPE_NFS -DWILD_STOP_AT_DIR \
 		-DUNICODE_SUPPORT -DUTF8_MAYBE_NATIVE -D_MBCS \
@@ -93,9 +93,9 @@ do-install:
 	${LN} -sf unzip ${STAGEDIR}${PREFIX}/bin/zipinfo
 	${INSTALL_SCRIPT} ${WRKSRC}/unix/zipgrep ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/unzip.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 	cd ${WRKSRC}/man && ${INSTALL_MAN} ${MANPAGES:Nunzip.1:Ninfo-unzip.1} \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile
index 542078917ccf..b339898e974d 100644
--- a/archivers/unzoo/Makefile
+++ b/archivers/unzoo/Makefile
@@ -20,7 +20,7 @@ LICENSE=	PD
 USES=		cpe
 EXTRA_DEFINES=	-DSYS_IS_UNIX -DSYS_HAS_MKDIR
 
-PLIST_FILES=	bin/unzoo man/man1/unzoo.1.gz
+PLIST_FILES=	bin/unzoo share/man/man1/unzoo.1.gz
 
 CFLAGS+=	-trigraphs
 
@@ -35,6 +35,6 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/archivers/urbackup-server/Makefile b/archivers/urbackup-server/Makefile
index 2ece89b01c89..251239dfef81 100644
--- a/archivers/urbackup-server/Makefile
+++ b/archivers/urbackup-server/Makefile
@@ -60,6 +60,6 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/urbackupsrv.conf-newsyslog \
 		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupsrv.conf
 
-	${INSTALL_MAN} ${WRKSRC}/docs/urbackupsrv.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/urbackupsrv.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/archivers/urbackup-server/pkg-plist b/archivers/urbackup-server/pkg-plist
index a5ce3698a813..6f0f3b8703b3 100644
--- a/archivers/urbackup-server/pkg-plist
+++ b/archivers/urbackup-server/pkg-plist
@@ -2,7 +2,7 @@ bin/urbackupsrv
 @(,,6555) bin/urbackup_mount_helper
 @(,,6555) bin/urbackup_snapshot_helper
 @mode 0444
-man/man1/urbackupsrv.1.gz
+share/man/man1/urbackupsrv.1.gz
 @mode 0644
 @sample etc/urbackup/urbackupsrv.conf.sample
 etc/newsyslog.conf.d/urbackupsrv.conf
diff --git a/astro/gpsman/Makefile b/astro/gpsman/Makefile
index 41b41fb35ecf..e09ff2270e07 100644
--- a/astro/gpsman/Makefile
+++ b/astro/gpsman/Makefile
@@ -31,7 +31,7 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gpsman.tcl ${STAGEDIR}${PREFIX}/bin/gpsman
-	${INSTALL_MAN} ${WRKSRC}/man/man1/gpsman.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/gpsman.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${GPSMANDIR}/gmsrc/gmicons ${STAGEDIR}${GPSMANDIR}/util
 	${INSTALL_DATA} ${WRKSRC}/gmsrc/*.tcl ${STAGEDIR}${GPSMANDIR}/gmsrc
 	${INSTALL_DATA} ${WRKSRC}/gmsrc/gmicons/* ${STAGEDIR}${GPSMANDIR}/gmsrc/gmicons
diff --git a/astro/gpsman/pkg-plist b/astro/gpsman/pkg-plist
index c66c8bf63403..e8c460ef312f 100644
--- a/astro/gpsman/pkg-plist
+++ b/astro/gpsman/pkg-plist
@@ -338,4 +338,4 @@ bin/gpsman
 %%GPSMANDIR%%/util/mou2gmn.tcl
 %%GPSMANDIR%%/util/shape2quadr.tcl
 %%GPSMANDIR%%/util/wpsinfull.tcl
-man/man1/gpsman.1.gz
+share/man/man1/gpsman.1.gz
diff --git a/astro/saoimage/Makefile b/astro/saoimage/Makefile
index ee8469992946..5a086461b3cc 100644
--- a/astro/saoimage/Makefile
+++ b/astro/saoimage/Makefile
@@ -16,7 +16,7 @@ ALL_TARGET=	${OPSYS}
 USES=		xorg
 USE_XORG=	x11
 
-PLIST_FILES=	bin/saoimage etc/imtoolrc.sample man/man1/saoimage.1.gz
+PLIST_FILES=	bin/saoimage etc/imtoolrc.sample share/man/man1/saoimage.1.gz
 
 post-patch:
 	# MFLAGS is reserved by make
@@ -25,6 +25,6 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/saoimage ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/imtoolrc ${STAGEDIR}${PREFIX}/etc/imtoolrc.sample
-	${INSTALL_MAN} ${WRKSRC}/doc/saoimage.man ${STAGEDIR}${MAN1PREFIX}/man/man1/saoimage.1
+	${INSTALL_MAN} ${WRKSRC}/doc/saoimage.man ${STAGEDIR}${PREFIX}/share/man/man1/saoimage.1
 
 .include <bsd.port.mk>
diff --git a/astro/sscalc/Makefile b/astro/sscalc/Makefile
index 79b22d8f0f21..bc52082b038c 100644
--- a/astro/sscalc/Makefile
+++ b/astro/sscalc/Makefile
@@ -20,7 +20,7 @@ pre-fetch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/sscalc ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/sscalc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/sscalc.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/astro/sscalc/pkg-plist b/astro/sscalc/pkg-plist
index 3ef566f86eb7..c45c816d69c2 100644
--- a/astro/sscalc/pkg-plist
+++ b/astro/sscalc/pkg-plist
@@ -1,4 +1,4 @@
 bin/sscalc
-man/man1/sscalc.1.gz
+share/man/man1/sscalc.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/cities.txt
diff --git a/astro/stardates/Makefile b/astro/stardates/Makefile
index ddf5201ed6af..29d4210a9f8f 100644
--- a/astro/stardates/Makefile
+++ b/astro/stardates/Makefile
@@ -11,7 +11,9 @@ MASTER_SITES=	ftp://ftp.cc.umanitoba.ca/startrek/stardates-pgms/ \
 MAINTAINER=	freebsd-ports@henrik.synth.no
 COMMENT=	Displays date in 5 formats (including stardate of course)
 
-PLIST_FILES=	bin/stardate man/man1/stardate.1.gz
+LICENSE=	BSD4CLAUSE
+
+PLIST_FILES=	bin/stardate share/man/man1/stardate.1.gz
 
 do-build:
 	${CC} ${CFLAGS} ${WRKSRC}/stardate.c -o ${WRKSRC}/stardate
@@ -20,6 +22,6 @@ do-install:
 	${INSTALL} ${WRKSRC}/stardate ${STAGEDIR}${PREFIX}/bin
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/stardate
 	${INSTALL_MAN} ${WRKSRC}/stardate.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile
index 27617e436775..8b94d3b608eb 100644
--- a/astro/wmsun/Makefile
+++ b/astro/wmsun/Makefile
@@ -22,11 +22,11 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
 		INCDIR="-I${LOCALBASE}/include" LIBDIR="-L${LOCALBASE}/lib"
 MAKE_JOBS_UNSAFE=	yes
 
-PLIST_FILES=	bin/wmsun man/man1/wmsun.1.gz
+PLIST_FILES=	bin/wmsun share/man/man1/wmsun.1.gz
 WRKSRC=		${WRKDIR}/dockapps-a1e67bd
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmsun ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/wmsun.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/wmsun.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index 78fb5d498f74..ef68eea90349 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -9,19 +9,22 @@ MASTER_SITES=	SUNSITE/apps/sound/mixers
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cpu's Audio Mixer [curses based]
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USES=		ncurses tar:tgz
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
 		LIBS="${LDFLAGS} -lncurses" \
 		BINDIR="${PREFIX}/bin" \
-		MANDIR="${MAN1PREFIX}/man/man1" \
+		MANDIR="${PREFIX}/share/man/man1" \
 		XEFILE=""
 
 PLIST_FILES=	bin/cam \
-		man/man1/cam.1.gz
+		share/man/man1/cam.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cam ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/cam.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/cam.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/cdplay/Makefile b/audio/cdplay/Makefile
index 58d09c944902..742f2c3d27b5 100644
--- a/audio/cdplay/Makefile
+++ b/audio/cdplay/Makefile
@@ -10,6 +10,9 @@ MASTER_SITES=	LOCAL/dannyboy
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CD-player with text-based user interface
 
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+
 USES=		ncurses
 MAKE_ARGS=	CFLAGS="${CFLAGS} -c -ansi"	\
 		LFLAGS="${LDFLAGS} -lncurses"   \
@@ -19,7 +22,7 @@ MAKE_ARGS=	CFLAGS="${CFLAGS} -c -ansi"	\
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/cdplay \
-		man/man1/cdplay.1.gz
+		share/man/man1/cdplay.1.gz
 
 post-patch:
 	${REINPLACE_CMD}			\
@@ -31,6 +34,6 @@ post-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cdplay ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/cdplay.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/cdplay.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index 8ad5916e9427..c1823a6523bf 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -55,7 +55,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.cfg \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.cfg.sample
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.cfg.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.cfg.5 ${STAGEDIR}${PREFIX}/share/man/man5
 
 .include <bsd.port.mk>
diff --git a/audio/darkice/pkg-plist b/audio/darkice/pkg-plist
index 8d29b8032517..52d01f6b2ac9 100644
--- a/audio/darkice/pkg-plist
+++ b/audio/darkice/pkg-plist
@@ -1,4 +1,4 @@
 bin/darkice
 @sample etc/darkice.cfg.sample
-man/man1/darkice.1.gz
-man/man5/darkice.cfg.5.gz
+share/man/man1/darkice.1.gz
+share/man/man5/darkice.cfg.5.gz
diff --git a/audio/dir2ogg/Makefile b/audio/dir2ogg/Makefile
index 0323d0cefce4..c931e0104b81 100644
--- a/audio/dir2ogg/Makefile
+++ b/audio/dir2ogg/Makefile
@@ -29,13 +29,13 @@ NO_ARCH=	yes
 
 PORTDOCS=	NEWS README
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/gtmixer/Makefile b/audio/gtmixer/Makefile
index 4dcd0a04b39e..11717875b7b1 100644
--- a/audio/gtmixer/Makefile
+++ b/audio/gtmixer/Makefile
@@ -20,7 +20,7 @@ USE_GNOME=	gtk20
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gtmixer
 	${CP} -r ${WRKSRC}/icons ${STAGEDIR}${PREFIX}/share/gtmixer/
-	${INSTALL_MAN} ${WRKSRC}/gtmixer.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/gtmixer.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/audio/gtmixer/pkg-plist b/audio/gtmixer/pkg-plist
index 3d979603fcf8..0ce078925eb1 100644
--- a/audio/gtmixer/pkg-plist
+++ b/audio/gtmixer/pkg-plist
@@ -1,5 +1,5 @@
 bin/gtmixer
-man/man1/gtmixer.1.gz
+share/man/man1/gtmixer.1.gz
 %%DATADIR%%/icons/tray/1.png
 %%DATADIR%%/icons/tray/2.png
 %%DATADIR%%/icons/tray/273.png
diff --git a/audio/jalv/Makefile b/audio/jalv/Makefile
index c1fbc9125340..8b6ca3b3d2b7 100644
--- a/audio/jalv/Makefile
+++ b/audio/jalv/Makefile
@@ -31,12 +31,7 @@ USE_QT=		core gui widgets buildtools_build
 USE_GNOME=	atk atkmm cairo cairomm pango pangomm libsigc++20 \
 		gdkpixbuf2 glib20 glibmm  gtk20 gtk30 gtkmm24
 
-post-patch:
-		@${REINPLACE_CMD} 's|$${MANDIR}|${MAN1PREFIX}/man|' \
-			${WRKSRC}/wscript
-
 post-install:
-		@${GZIP_CMD} ${STAGEDIR}${MAN1PREFIX}/man/man1/*
 		@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jalv*
 
 .include <bsd.port.mk>
diff --git a/audio/jalv/pkg-plist b/audio/jalv/pkg-plist
index dd6fb70ac513..915c91b611ce 100644
--- a/audio/jalv/pkg-plist
+++ b/audio/jalv/pkg-plist
@@ -3,7 +3,7 @@ bin/jalv.gtk
 bin/jalv.gtk3
 bin/jalv.gtkmm
 bin/jalv.qt5
-man/man1/jalv.1.gz
-man/man1/jalv.gtk.1.gz
-man/man1/jalv.gtkmm.1.gz
-man/man1/jalv.qt.1.gz
+share/man/man1/jalv.1.gz
+share/man/man1/jalv.gtk.1.gz
+share/man/man1/jalv.gtkmm.1.gz
+share/man/man1/jalv.qt.1.gz
diff --git a/audio/liblo/Makefile b/audio/liblo/Makefile
index 0422ee2e5666..f5cb9794cafd 100644
--- a/audio/liblo/Makefile
+++ b/audio/liblo/Makefile
@@ -44,7 +44,7 @@ post-install:
 		${STAGEDIR}${EXAMPLESDIR}
 post-install-DOXYGEN-on:
 	(cd ${WRKSRC}/doc/man/man3 && ${INSTALL_MAN} l*.3 p*.3 \
-		${STAGEDIR}${MAN3PREFIX}/man/man3/)
+		${STAGEDIR}${PREFIX}/share/man/man3/)
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/audio/liblo/pkg-plist b/audio/liblo/pkg-plist
index 75fed4a7d3cb..5debce5b6627 100644
--- a/audio/liblo/pkg-plist
+++ b/audio/liblo/pkg-plist
@@ -14,13 +14,13 @@ lib/liblo.so
 lib/liblo.so.7
 lib/liblo.so.7.2.0
 libdata/pkgconfig/liblo.pc
-%%DOXYGEN%%man/man3/liblo.3.gz
-%%DOXYGEN%%man/man3/liblolowlevel.3.gz
-%%DOXYGEN%%man/man3/lo.h.3.gz
-%%DOXYGEN%%man/man3/lo_arg.3.gz
-%%DOXYGEN%%man/man3/lo_lowlevel.h.3.gz
-%%DOXYGEN%%man/man3/lo_osc_types.h.3.gz
-%%DOXYGEN%%man/man3/lo_serverthread.h.3.gz
-%%DOXYGEN%%man/man3/lo_timetag.3.gz
-%%DOXYGEN%%man/man3/lo_types.h.3.gz
-%%DOXYGEN%%man/man3/pp.3.gz
+%%DOXYGEN%%share/man/man3/liblo.3.gz
+%%DOXYGEN%%share/man/man3/liblolowlevel.3.gz
+%%DOXYGEN%%share/man/man3/lo.h.3.gz
+%%DOXYGEN%%share/man/man3/lo_arg.3.gz
+%%DOXYGEN%%share/man/man3/lo_lowlevel.h.3.gz
+%%DOXYGEN%%share/man/man3/lo_osc_types.h.3.gz
+%%DOXYGEN%%share/man/man3/lo_serverthread.h.3.gz
+%%DOXYGEN%%share/man/man3/lo_timetag.3.gz
+%%DOXYGEN%%share/man/man3/lo_types.h.3.gz
+%%DOXYGEN%%share/man/man3/pp.3.gz
diff --git a/audio/lv2file/Makefile b/audio/lv2file/Makefile
index c7d8f16bd921..5b1549cba27b 100644
--- a/audio/lv2file/Makefile
+++ b/audio/lv2file/Makefile
@@ -23,10 +23,10 @@ LIB_DEPENDS=	libargtable2.so:devel/argtable \
 USES=		gmake localbase pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	jeremysalwen
-PLIST_FILES=	bin/lv2file man/man1/lv2file.1.gz
+PLIST_FILES=	bin/lv2file share/man/man1/lv2file.1.gz
 
 post-install:
-		${INSTALL_MAN} ${WRKSRC}/debian/lv2file.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+		${INSTALL_MAN} ${WRKSRC}/debian/lv2file.1 ${STAGEDIR}${PREFIX}/share/man/man1
 		@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lv2file
 
 .include <bsd.port.mk>
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index 4f8e6808f706..110a4de89c32 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -73,8 +73,7 @@ pre-install:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
-	${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/murmur/pkg-plist b/audio/murmur/pkg-plist
index b51a61c72389..ebea70067760 100644
--- a/audio/murmur/pkg-plist
+++ b/audio/murmur/pkg-plist
@@ -1,5 +1,5 @@
 @sample etc/murmur.ini.sample
-man/man1/murmurd.1.gz
+share/man/man1/murmurd.1.gz
 sbin/murmurd
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
diff --git a/audio/py-pyliblo/Makefile b/audio/py-pyliblo/Makefile
index 9d05f0ef8ef0..8092db17dcd8 100644
--- a/audio/py-pyliblo/Makefile
+++ b/audio/py-pyliblo/Makefile
@@ -25,7 +25,7 @@ post-patch:
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/liblo.so
-	${INSTALL_MAN} ${WRKSRC}/scripts/dump_osc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/scripts/send_osc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/scripts/dump_osc.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/scripts/send_osc.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/py-pyliblo/pkg-plist b/audio/py-pyliblo/pkg-plist
index d323ad6a0e91..348279b00332 100644
--- a/audio/py-pyliblo/pkg-plist
+++ b/audio/py-pyliblo/pkg-plist
@@ -1,5 +1,5 @@
 bin/dump_osc
 bin/send_osc
-man/man1/dump_osc.1.gz
-man/man1/send_osc.1.gz
+share/man/man1/dump_osc.1.gz
+share/man/man1/send_osc.1.gz
 %%PYTHON_SITELIBDIR%%/liblo.so
diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile
index d51004f06d12..236d6342128b 100644
--- a/audio/rawrec/Makefile
+++ b/audio/rawrec/Makefile
@@ -20,7 +20,7 @@ USES=		gmake
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CPPFLAGS} ${CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -lm -lpthread"
 
-PLIST_FILES=	bin/rawplay bin/rawrec man/man1/rawplay.1.gz man/man1/rawrec.1.gz
+PLIST_FILES=	bin/rawplay bin/rawrec share/man/man1/rawplay.1.gz share/man/man1/rawrec.1.gz
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
@@ -29,7 +29,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rawrec ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf rawrec ${STAGEDIR}${PREFIX}/bin/rawplay
-	${INSTALL_MAN} ${WRKSRC}/../docs/user/rawrec.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${LN} -sf rawrec.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/rawplay.1
+	${INSTALL_MAN} ${WRKSRC}/../docs/user/rawrec.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${LN} -sf rawrec.1 ${STAGEDIR}${PREFIX}/share/man/man1/rawplay.1
 
 .include <bsd.port.mk>
diff --git a/audio/ripit/Makefile b/audio/ripit/Makefile
index 4115d47aaadc..c576ac4f78c1 100644
--- a/audio/ripit/Makefile
+++ b/audio/ripit/Makefile
@@ -31,7 +31,7 @@ OPTIONS_DEFINE=	EXAMPLES
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ripit.pl ${STAGEDIR}${PREFIX}/bin/ripit
-	${INSTALL_MAN} ${WRKSRC}/ripit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ripit.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/config ${STAGEDIR}${EXAMPLESDIR}/config
 
diff --git a/audio/ripit/pkg-plist b/audio/ripit/pkg-plist
index 4ddcbed4c2bd..100055f4ed08 100644
--- a/audio/ripit/pkg-plist
+++ b/audio/ripit/pkg-plist
@@ -1,3 +1,3 @@
 bin/ripit
-man/man1/ripit.1.gz
+share/man/man1/ripit.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config
diff --git a/audio/soundgrab/Makefile b/audio/soundgrab/Makefile
index 8cb26d249102..2c80add2fe7e 100644
--- a/audio/soundgrab/Makefile
+++ b/audio/soundgrab/Makefile
@@ -23,11 +23,11 @@ NO_BUILD=	yes
 USES=		perl5 shebangfix
 SHEBANG_FILES=	src/soundgrab
 
-PLIST_FILES=	bin/soundgrab man/man1/soundgrab.1.gz
+PLIST_FILES=	bin/soundgrab share/man/man1/soundgrab.1.gz
 
 do-install:
 	@pod2man ${WRKSRC}/src/soundgrab ${WRKSRC}/src/soundgrab.1
 	${INSTALL_SCRIPT} ${WRKSRC}/src/soundgrab ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/src/soundgrab.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/src/soundgrab.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/umodplayer/Makefile b/audio/umodplayer/Makefile
index 6c213a4f0db2..125506462709 100644
--- a/audio/umodplayer/Makefile
+++ b/audio/umodplayer/Makefile
@@ -22,7 +22,7 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -32,6 +32,6 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/audio/waon/Makefile b/audio/waon/Makefile
index 337ffd6af1ad..c5e554bf80dc 100644
--- a/audio/waon/Makefile
+++ b/audio/waon/Makefile
@@ -23,12 +23,13 @@ USES=		gnome ncurses pkgconfig
 USE_GNOME=	gtk20
 
 PLIST_FILES=	bin/waon bin/pv bin/gwaon \
-		man/man1/gwaon.1.gz man/man1/pv.1.gz man/man1/waon.1.gz
+		share/man/man1/gwaon.1.gz share/man/man1/pv.1.gz \
+		share/man/man1/waon.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/waon \
 		${WRKSRC}/pv \
 		${WRKSRC}/gwaon ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/*.1  ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/*.1  ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index 77228835dffe..6c3f8fad9c00 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -10,13 +10,16 @@ MASTER_SITES=	http://mpx.freeshell.net/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Audio mixer (gtk and Xlib) for X11R6
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	xmixer
 
 PLIST_FILES=	bin/xmixer \
-		man/man1/xmixer.1.gz
+		share/man/man1/xmixer.1.gz
 
 USES=		xorg
 USE_XORG=	x11 xt ice xaw xmu sm
@@ -32,6 +35,6 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmixer ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xmixer.man ${STAGEDIR}${MAN1PREFIX}/man/man1/xmixer.1
+	${INSTALL_MAN} ${WRKSRC}/xmixer.man ${STAGEDIR}${PREFIX}/share/man/man1/xmixer.1
 
 .include <bsd.port.mk>