*/*: Move manpages to share/man

Approved by:	portmgr (blanket)

23 files changed, 53 insertions, 34 deletions

diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index fc03b383b3bd..2dab15df1808 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cpio
 DISTVERSION=	2.15
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	g
@@ -17,6 +18,7 @@ USES=		cpe tar:bzip2
 CPE_VENDOR=	gnu
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--program-prefix=g \
 		--with-rmt=/etc/rmt
 TEST_TARGET=	check
diff --git a/archivers/gcpio/pkg-plist b/archivers/gcpio/pkg-plist
index fa0bd6d343fa..3f5c4b5a7c4d 100644
--- a/archivers/gcpio/pkg-plist
+++ b/archivers/gcpio/pkg-plist
@@ -1,5 +1,4 @@
 bin/gcpio
-man/man1/gcpio.1.gz
 %%NLS%%share/locale/bg/LC_MESSAGES/cpio.mo
 %%NLS%%share/locale/da/LC_MESSAGES/cpio.mo
 %%NLS%%share/locale/de/LC_MESSAGES/cpio.mo
@@ -28,3 +27,4 @@ man/man1/gcpio.1.gz
 %%NLS%%share/locale/vi/LC_MESSAGES/cpio.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/cpio.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/cpio.mo
+share/man/man1/gcpio.1.gz
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index bcfa094a5f4f..b028961f4c6f 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tar
 DISTVERSION=	1.35
+PORTREVISION=	1
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	g
@@ -11,11 +12,10 @@ WWW=		https://www.gnu.org/software/tar/
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-INFO=		tar
-
 USES=		charsetfix cpe iconv:${STATIC_ARGS} localbase tar:xz
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--program-prefix=g
 # unbuckle safety belt: FreeBSD/i386 still has 32-bit time_t
 CONFIGURE_ARGS+=--disable-year2038
@@ -23,6 +23,8 @@ CONFIGURE_ENV=	DEFAULT_RMT_COMMAND=/etc/rmt
 # supply result to skip a test that will abort configure if run as root
 CONFIGURE_ENV+=	gl_cv_func_mknod_works=yes
 
+INFO=		tar
+
 # 1.35 has too many problems in the testsuite:
 # missing .at source files, bashisms, brittle xz tests
 #TEST_TARGET=	check
diff --git a/archivers/gtar/pkg-plist b/archivers/gtar/pkg-plist
index 4b54344c752b..5f40be92da3e 100644
--- a/archivers/gtar/pkg-plist
+++ b/archivers/gtar/pkg-plist
@@ -1,7 +1,5 @@
 bin/gtar
 libexec/grmt
-man/man1/gtar.1.gz
-man/man8/grmt.8.gz
 %%NLS%%share/locale/bg/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/tar.mo
@@ -41,3 +39,5 @@ man/man8/grmt.8.gz
 %%NLS%%share/locale/vi/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/tar.mo
+share/man/man1/gtar.1.gz
+share/man/man8/grmt.8.gz
diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
index 354a7908a371..6104932a1f8a 100644
--- a/audio/flac/pkg-plist
+++ b/audio/flac/pkg-plist
@@ -24,8 +24,6 @@ lib/libFLAC.so.12
 lib/libFLAC.so.12.1.0
 libdata/pkgconfig/flac++.pc
 libdata/pkgconfig/flac.pc
-share/man/man1/flac.1.gz
-share/man/man1/metaflac.1.gz
 share/aclocal/libFLAC++.m4
 share/aclocal/libFLAC.m4
 %%PORTDOCS%%%%DOCSDIR%%/FLAC.tag
@@ -275,3 +273,5 @@ share/aclocal/libFLAC.m4
 %%PORTDOCS%%%%DOCSDIR%%/api/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/images/logo.svg
 %%PORTDOCS%%%%DOCSDIR%%/images/logo130.gif
+share/man/man1/flac.1.gz
+share/man/man1/metaflac.1.gz
diff --git a/audio/libao/pkg-plist b/audio/libao/pkg-plist
index e7614a15644a..238689689f0b 100644
--- a/audio/libao/pkg-plist
+++ b/audio/libao/pkg-plist
@@ -10,7 +10,6 @@ lib/ao/plugins-4/liboss.so
 %%PULSEAUDIO%%lib/ao/plugins-4/libpulse.so
 %%SNDIO%%lib/ao/plugins-4/libsndio.so
 libdata/pkgconfig/ao.pc
-share/man/man5/libao.conf.5.gz
 share/aclocal/ao.m4
 %%PORTDOCS%%%%DOCSDIR%%/ao_append_option.html
 %%PORTDOCS%%%%DOCSDIR%%/ao_close.html
@@ -48,3 +47,4 @@ share/aclocal/ao.m4
 %%PORTDOCS%%%%DOCSDIR%%/plugin-api.html
 %%PORTDOCS%%%%DOCSDIR%%/plugin-overview.html
 %%PORTDOCS%%%%DOCSDIR%%/style.css
+share/man/man5/libao.conf.5.gz
diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index 11a16660d68f..4b61c3b38f33 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mpg321
 PORTVERSION=	0.2.10
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -16,11 +16,12 @@ USES=		cpe
 
 CPE_VENDOR=	mpg321_project
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-mpg123-symlink
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_FILES=	bin/mpg321 man/man1/mpg321.1.gz
+PLIST_FILES=	bin/mpg321 share/man/man1/mpg321.1.gz
 
 OPTIONS_DEFINE=	SCROBBLER
 SCROBBLER_DESC=	Last.fm Audioscrobbler support
diff --git a/audio/opus-tools/Makefile b/audio/opus-tools/Makefile
index 0e2e80b00adb..397db842b87e 100644
--- a/audio/opus-tools/Makefile
+++ b/audio/opus-tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opus-tools
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	MOZILLA/opus
 
@@ -21,6 +21,7 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 USES=		pkgconfig
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-maintainer-mode
 
 .include <bsd.port.mk>
diff --git a/audio/opus-tools/pkg-plist b/audio/opus-tools/pkg-plist
index 411f895c333b..0eaedc44cfd2 100644
--- a/audio/opus-tools/pkg-plist
+++ b/audio/opus-tools/pkg-plist
@@ -1,6 +1,6 @@
 bin/opusdec
 bin/opusenc
 bin/opusinfo
-man/man1/opusdec.1.gz
-man/man1/opusenc.1.gz
-man/man1/opusinfo.1.gz
+share/man/man1/opusdec.1.gz
+share/man/man1/opusenc.1.gz
+share/man/man1/opusinfo.1.gz
diff --git a/audio/speex/pkg-plist b/audio/speex/pkg-plist
index 454e409194e6..efc3b567793b 100644
--- a/audio/speex/pkg-plist
+++ b/audio/speex/pkg-plist
@@ -12,6 +12,6 @@ lib/libspeex.so
 lib/libspeex.so.1
 lib/libspeex.so.1.5.2
 libdata/pkgconfig/speex.pc
+share/aclocal/speex.m4
 share/man/man1/speexdec.1.gz
 share/man/man1/speexenc.1.gz
-share/aclocal/speex.m4
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 481cb71d95bb..4b6694c95bc5 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vorbis-tools
 DISTVERSION=	1.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	https://downloads.xiph.org/releases/vorbis/
@@ -23,6 +23,7 @@ LIB_DEPENDS=	libao.so:audio/libao \
 USES=		cpe iconv localbase:ldflags pkgconfig
 CPE_VENDOR=	xiph
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread"
 CONFIGURE_ARGS=	--without-kate
 
diff --git a/audio/vorbis-tools/pkg-plist b/audio/vorbis-tools/pkg-plist
index 8503010ed0c7..8f5dff76d212 100644
--- a/audio/vorbis-tools/pkg-plist
+++ b/audio/vorbis-tools/pkg-plist
@@ -4,12 +4,6 @@ bin/oggenc
 bin/ogginfo
 bin/vcut
 bin/vorbiscomment
-man/man1/ogg123.1.gz
-man/man1/oggdec.1.gz
-man/man1/oggenc.1.gz
-man/man1/ogginfo.1.gz
-man/man1/vcut.1.gz
-man/man1/vorbiscomment.1.gz
 share/examples/vorbis-tools/ogg123rc
 %%NLS%%share/locale/be/LC_MESSAGES/vorbis-tools.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/vorbis-tools.mo
@@ -28,3 +22,9 @@ share/examples/vorbis-tools/ogg123rc
 %%NLS%%share/locale/sv/LC_MESSAGES/vorbis-tools.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/vorbis-tools.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/vorbis-tools.mo
+share/man/man1/ogg123.1.gz
+share/man/man1/oggdec.1.gz
+share/man/man1/oggenc.1.gz
+share/man/man1/ogginfo.1.gz
+share/man/man1/vcut.1.gz
+share/man/man1/vorbiscomment.1.gz
diff --git a/comms/wy60/Makefile b/comms/wy60/Makefile
index 9fb37230fc74..2e724cb6a200 100644
--- a/comms/wy60/Makefile
+++ b/comms/wy60/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	wy60
 PORTVERSION=	2.0.9
+PORTREVISION=	1
 CATEGORIES=	comms
 
 MAINTAINER=	naddy@FreeBSD.org
@@ -15,6 +16,7 @@ GH_TAGNAME=	8e082bf
 
 USES=		ncurses
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 MAKE_ARGS=	etc_DATA=wy60.rc.sample
 
 pre-build:
diff --git a/comms/wy60/pkg-plist b/comms/wy60/pkg-plist
index a4e40179a3be..e8b16ae28e64 100644
--- a/comms/wy60/pkg-plist
+++ b/comms/wy60/pkg-plist
@@ -1,3 +1,3 @@
 bin/wy60
 @sample etc/wy60.rc.sample
-man/man1/wy60.1.gz
+share/man/man1/wy60.1.gz
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index c1757781ec46..11ecb0e84d38 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bvi
 DISTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.src.tar.gz
@@ -13,5 +14,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		ncurses
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 .include <bsd.port.mk>
diff --git a/editors/bvi/pkg-plist b/editors/bvi/pkg-plist
index 26212ec7cd98..9dc0d72a5205 100644
--- a/editors/bvi/pkg-plist
+++ b/editors/bvi/pkg-plist
@@ -2,6 +2,6 @@ bin/bmore
 bin/bvedit
 bin/bvi
 bin/bview
-man/man1/bmore.1.gz
-man/man1/bvi.1.gz
 %%DATADIR%%/bmore.help
+share/man/man1/bmore.1.gz
+share/man/man1/bvi.1.gz
diff --git a/games/gtypist/Makefile b/games/gtypist/Makefile
index 3d258e56da3f..7fa63a82a8e1 100644
--- a/games/gtypist/Makefile
+++ b/games/gtypist/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gtypist
 PORTVERSION=	2.9.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games education
 MASTER_SITES=	GNU
 
@@ -12,6 +12,7 @@ LICENSE=	GPLv3
 
 USES=		iconv ncurses shebangfix tar:xz
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	EMACS=no \
 		ac_cv_header_ncursesw_ncurses_h=yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${WRKDIR}/include
diff --git a/games/gtypist/pkg-plist b/games/gtypist/pkg-plist
index f89a93664fad..4bcc5683b042 100644
--- a/games/gtypist/pkg-plist
+++ b/games/gtypist/pkg-plist
@@ -1,7 +1,5 @@
 bin/gtypist
 bin/typefortune
-man/man1/gtypist.1.gz
-man/man1/typefortune.1.gz
 share/gtypist/c.typ
 share/gtypist/cs.typ
 share/gtypist/d.typ
@@ -60,3 +58,5 @@ share/gtypist/v.typ
 %%NLS%%share/locale/tr/LC_MESSAGES/gtypist.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gtypist.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gtypist.mo
+share/man/man1/gtypist.1.gz
+share/man/man1/typefortune.1.gz
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index aa51034f3fcb..00ca140b1995 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xsoldier
 PORTVERSION=	1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.interq.or.jp/libra/oohara/xsoldier/
 
@@ -8,9 +8,12 @@ MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Space-based shoot-em up game for X11
 WWW=		http://www.interq.or.jp/libra/oohara/xsoldier/
 
+LICENSE=	GPLv2+
+
 USES=		xorg
 USE_XORG=	x11 ice sm xpm
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--localstatedir=/var
 MAKE_ARGS=	CC_OPTIMIZE="${CFLAGS}"
 
diff --git a/games/xsoldier/pkg-plist b/games/xsoldier/pkg-plist
index 11933fa76c26..22c90da2cd6c 100644
--- a/games/xsoldier/pkg-plist
+++ b/games/xsoldier/pkg-plist
@@ -1,6 +1,6 @@
 @(,games,2555) bin/xsoldier
-man/man6/xsoldier.6.gz
 @sample(,games,664) %%EXAMPLESDIR%%/xsoldier.scores /var/games/xsoldier.scores
+share/man/man6/xsoldier.6.gz
 %%DATADIR%%/Boss1.xpm
 %%DATADIR%%/Boss2.xpm
 %%DATADIR%%/Boss3.xpm
diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index 9aad0d6d5d30..188b1e34815d 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	calcoo
 PORTVERSION=	1.3.18
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	SF
 
@@ -8,12 +8,15 @@ MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	RPN and algebraic scientific calculator
 WWW=		https://calcoo.sourceforge.net/
 
+LICENSE=	GPLv2+
+
 USES=		gnome pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 LIBS+=		-lm
 
 PLIST_FILES=	bin/calcoo \
-		man/man1/calcoo.1.gz
+		share/man/man1/calcoo.1.gz
 
 .include <bsd.port.mk>
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index 79e6cc400dca..828eb03a86df 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	galculator
 PORTVERSION=	2.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=v
 CATEGORIES=	math
 
@@ -16,6 +16,7 @@ USE_GITHUB=	yes
 USES=		autoreconf gettext gmake gnome libtool localbase pkgconfig
 USE_GNOME=	cairo intltool
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 OPTIONS_SINGLE=		GTK
 OPTIONS_SINGLE_GTK=	GTK2 GTK3
diff --git a/math/galculator/pkg-plist b/math/galculator/pkg-plist
index 1cfb548b7626..7f8e242d2051 100644
--- a/math/galculator/pkg-plist
+++ b/math/galculator/pkg-plist
@@ -1,5 +1,4 @@
 bin/galculator
-man/man1/galculator.1.gz
 share/appdata/galculator.appdata.xml
 share/applications/galculator.desktop
 %%DATADIR%%/ui/about.ui
@@ -48,4 +47,5 @@ share/locale/tr/LC_MESSAGES/galculator.mo
 share/locale/uk/LC_MESSAGES/galculator.mo
 share/locale/zh_CN/LC_MESSAGES/galculator.mo
 share/locale/zh_TW/LC_MESSAGES/galculator.mo
+share/man/man1/galculator.1.gz
 share/pixmaps/galculator.xpm