Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Mar 2024 16:35:22 GMT
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 236642e3d2c2 - main - sysutils: Move manpages to share/man
Message-ID:  <202403111635.42BGZMCs034850@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=236642e3d2c2bf79ddd5eb2bd71863cc21fedbe6

commit 236642e3d2c2bf79ddd5eb2bd71863cc21fedbe6
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-03-11 16:03:47 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-03-11 16:34:18 +0000

    sysutils: Move manpages to share/man
    
    Approved by:    portmgr (blanket)
---
 sysutils/fwup/Makefile               |   6 +-
 sysutils/gpart/Makefile              |   4 +-
 sysutils/gpart/files/patch-inst.defs |  10 +-
 sysutils/mstflint/Makefile           |   3 +-
 sysutils/mstflint/pkg-plist          |  34 +++---
 sysutils/openzfs/Makefile            |   2 +
 sysutils/openzfs/pkg-plist           | 196 +++++++++++++++++------------------
 7 files changed, 131 insertions(+), 124 deletions(-)

diff --git a/sysutils/fwup/Makefile b/sysutils/fwup/Makefile
index cbae6f5025a3..7d9afec433ae 100644
--- a/sysutils/fwup/Makefile
+++ b/sysutils/fwup/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	fwup
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.10.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dch@FreeBSD.org
@@ -23,13 +24,14 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	fhunleth
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 SHEBANG_FILES=	img2fwup scripts/*.sh
 
 PLIST_FILES=	bin/fwup \
 		bin/img2fwup \
-		man/man1/fwup.1.gz \
-		share/bash-completion/completions/fwup
+		share/bash-completion/completions/fwup \
+		share/man/man1/fwup.1.gz
 
 PORTDOCS=	README.md
 
diff --git a/sysutils/gpart/Makefile b/sysutils/gpart/Makefile
index d61ff0dbdabc..b7ee1c43b2ce 100644
--- a/sysutils/gpart/Makefile
+++ b/sysutils/gpart/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gpart
 PORTVERSION=	0.1h
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	SUNSITE/system/filesystems \
 		http://mirror.amdmi3.ru/distfiles/
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
-PLIST_FILES=	sbin/gpart man/man8/gpart.8.gz
+PLIST_FILES=	sbin/gpart share/man/man8/gpart.8.gz
 CFLAGS+=	-std=c99
 
 OPTIONS_DEFINE=	STATIC
diff --git a/sysutils/gpart/files/patch-inst.defs b/sysutils/gpart/files/patch-inst.defs
index 8438494e9392..b32a589b8805 100644
--- a/sysutils/gpart/files/patch-inst.defs
+++ b/sysutils/gpart/files/patch-inst.defs
@@ -1,6 +1,6 @@
---- inst.defs.orig	2000-12-14 01:45:49.000000000 +0300
-+++ inst.defs	2013-10-17 00:03:33.617772686 +0400
-@@ -1,8 +1,8 @@
+--- inst.defs.orig	2000-12-13 22:45:49 UTC
++++ inst.defs
+@@ -1,9 +1,9 @@
  #
  # installation directories for gpart
  #
@@ -9,5 +9,7 @@
 +prefix=$(DESTDIR)$(PREFIX)
 +bindir=$(prefix)/sbin
  libdir=$(prefix)/lib
- mandir=$(prefix)/man
+-mandir=$(prefix)/man
++mandir=$(prefix)/share/man
  manext=8
+ sharedir=$(prefix)/share
diff --git a/sysutils/mstflint/Makefile b/sysutils/mstflint/Makefile
index 4e720e64dff5..251c2b59e0fb 100644
--- a/sysutils/mstflint/Makefile
+++ b/sysutils/mstflint/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mstflint
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.25.0-1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	olivier@FreeBSD.org
@@ -19,6 +19,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Mellanox
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 OPTIONS_DEFINE=	FWMANAGER ADAB
 OPTIONS_SUB=	yes
diff --git a/sysutils/mstflint/pkg-plist b/sysutils/mstflint/pkg-plist
index c2688e255001..3609f0474cea 100644
--- a/sysutils/mstflint/pkg-plist
+++ b/sysutils/mstflint/pkg-plist
@@ -131,23 +131,23 @@ lib/mstflint/python_tools/mtcr.py
 lib/mstflint/python_tools/regaccess.py
 lib/mstflint/python_tools/rreg_access.so
 lib/mstflint/python_tools/tools_version.py
-man/man1/mstarchive.1.gz
-man/man1/mstcongestion.1.gz
-man/man1/mstconfig.1.gz
-man/man1/mstflint.1.gz
-man/man1/mstfwmanager.1.gz
-man/man1/mstfwreset.1.gz
-man/man1/mstfwtrace.1.gz
-man/man1/mstlink.1.gz
-man/man1/mstmcra.1.gz
-man/man1/mstmread.1.gz
-man/man1/mstmtserver.1.gz
-man/man1/mstmwrite.1.gz
-man/man1/mstprivhost.1.gz
-man/man1/mstreg.1.gz
-man/man1/mstregdump.1.gz
-man/man1/mstresourcedump.1.gz
-man/man1/mstvpd.1.gz
+share/man/man1/mstarchive.1.gz
+share/man/man1/mstcongestion.1.gz
+share/man/man1/mstconfig.1.gz
+share/man/man1/mstflint.1.gz
+share/man/man1/mstfwmanager.1.gz
+share/man/man1/mstfwreset.1.gz
+share/man/man1/mstfwtrace.1.gz
+share/man/man1/mstlink.1.gz
+share/man/man1/mstmcra.1.gz
+share/man/man1/mstmread.1.gz
+share/man/man1/mstmtserver.1.gz
+share/man/man1/mstmwrite.1.gz
+share/man/man1/mstprivhost.1.gz
+share/man/man1/mstreg.1.gz
+share/man/man1/mstregdump.1.gz
+share/man/man1/mstresourcedump.1.gz
+share/man/man1/mstvpd.1.gz
 %%DATADIR%%/AbirGearBox.csv
 %%DATADIR%%/AmosGearBox.csv
 %%DATADIR%%/AmosGearBoxManager.csv
diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index b3638595519e..0254187d2e05 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openzfs
 PORTVERSION=	2023113000
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	freqlabs@FreeBSD.org
@@ -24,6 +25,7 @@ SHEBANG_FILES=	tests/zfs-tests/tests/functional/trim/trim.cfg \
 		cmd/arc_summary
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	MAKE=gmake --prefix=${PREFIX} --with-config="user"
 
 OPTIONS_DEFINE=	DEBUG PYTHON TESTS
diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist
index 0b21d0d69ca8..ea46b291888d 100644
--- a/sysutils/openzfs/pkg-plist
+++ b/sysutils/openzfs/pkg-plist
@@ -384,104 +384,6 @@ libexec/zfs/zpool.d/vendor
 libexec/zfs/zpool.d/w_proc
 libexec/zfs/zpool.d/w_ucor
 libexec/zfs/zpool_influxdb
-man/man1/arcstat.1.gz
-%%TESTS%%man/man1/raidz_test.1.gz
-%%TESTS%%man/man1/test-runner.1.gz
-man/man1/zhack.1.gz
-man/man1/ztest.1.gz
-man/man1/zvol_wait.1.gz
-man/man4/spl.4.gz
-man/man4/zfs.4.gz
-man/man5/vdev_id.conf.5.gz
-man/man7/dracut.zfs.7.gz
-man/man7/vdevprops.7.gz
-man/man7/zfsconcepts.7.gz
-man/man7/zfsprops.7.gz
-man/man7/zpool-features.7.gz
-man/man7/zpoolconcepts.7.gz
-man/man7/zpoolprops.7.gz
-man/man8/fsck.zfs.8.gz
-man/man8/mount.zfs.8.gz
-man/man8/vdev_id.8.gz
-man/man8/zdb.8.gz
-man/man8/zed.8.gz
-man/man8/zfs-allow.8.gz
-man/man8/zfs-bookmark.8.gz
-man/man8/zfs-change-key.8.gz
-man/man8/zfs-clone.8.gz
-man/man8/zfs-create.8.gz
-man/man8/zfs-destroy.8.gz
-man/man8/zfs-diff.8.gz
-man/man8/zfs-get.8.gz
-man/man8/zfs-groupspace.8.gz
-man/man8/zfs-hold.8.gz
-man/man8/zfs-inherit.8.gz
-man/man8/zfs-jail.8.gz
-man/man8/zfs-list.8.gz
-man/man8/zfs-load-key.8.gz
-man/man8/zfs-mount-generator.8.gz
-man/man8/zfs-mount.8.gz
-man/man8/zfs-program.8.gz
-man/man8/zfs-project.8.gz
-man/man8/zfs-projectspace.8.gz
-man/man8/zfs-promote.8.gz
-man/man8/zfs-receive.8.gz
-man/man8/zfs-recv.8.gz
-man/man8/zfs-redact.8.gz
-man/man8/zfs-release.8.gz
-man/man8/zfs-rename.8.gz
-man/man8/zfs-rollback.8.gz
-man/man8/zfs-send.8.gz
-man/man8/zfs-set.8.gz
-man/man8/zfs-share.8.gz
-man/man8/zfs-snapshot.8.gz
-man/man8/zfs-unallow.8.gz
-man/man8/zfs-unjail.8.gz
-man/man8/zfs-unload-key.8.gz
-man/man8/zfs-unmount.8.gz
-man/man8/zfs-upgrade.8.gz
-man/man8/zfs-userspace.8.gz
-man/man8/zfs-wait.8.gz
-man/man8/zfs.8.gz
-man/man8/zfs_ids_to_path.8.gz
-man/man8/zfs_prepare_disk.8.gz
-man/man8/zgenhostid.8.gz
-man/man8/zinject.8.gz
-man/man8/zpool-add.8.gz
-man/man8/zpool-attach.8.gz
-man/man8/zpool-checkpoint.8.gz
-man/man8/zpool-clear.8.gz
-man/man8/zpool-create.8.gz
-man/man8/zpool-destroy.8.gz
-man/man8/zpool-detach.8.gz
-man/man8/zpool-events.8.gz
-man/man8/zpool-export.8.gz
-man/man8/zpool-get.8.gz
-man/man8/zpool-history.8.gz
-man/man8/zpool-import.8.gz
-man/man8/zpool-initialize.8.gz
-man/man8/zpool-iostat.8.gz
-man/man8/zpool-labelclear.8.gz
-man/man8/zpool-list.8.gz
-man/man8/zpool-offline.8.gz
-man/man8/zpool-online.8.gz
-man/man8/zpool-reguid.8.gz
-man/man8/zpool-remove.8.gz
-man/man8/zpool-reopen.8.gz
-man/man8/zpool-replace.8.gz
-man/man8/zpool-resilver.8.gz
-man/man8/zpool-scrub.8.gz
-man/man8/zpool-set.8.gz
-man/man8/zpool-split.8.gz
-man/man8/zpool-status.8.gz
-man/man8/zpool-sync.8.gz
-man/man8/zpool-trim.8.gz
-man/man8/zpool-upgrade.8.gz
-man/man8/zpool-wait.8.gz
-man/man8/zpool.8.gz
-man/man8/zpool_influxdb.8.gz
-man/man8/zstream.8.gz
-man/man8/zstreamdump.8.gz
 sbin/fsck.zfs
 sbin/zdb
 sbin/zfs
@@ -492,6 +394,104 @@ sbin/zpool
 sbin/zstream
 sbin/zstreamdump
 sbin/ztest
+share/man/man1/arcstat.1.gz
+%%TESTS%%share/man/man1/raidz_test.1.gz
+%%TESTS%%share/man/man1/test-runner.1.gz
+share/man/man1/zhack.1.gz
+share/man/man1/ztest.1.gz
+share/man/man1/zvol_wait.1.gz
+share/man/man4/spl.4.gz
+share/man/man4/zfs.4.gz
+share/man/man5/vdev_id.conf.5.gz
+share/man/man7/dracut.zfs.7.gz
+share/man/man7/vdevprops.7.gz
+share/man/man7/zfsconcepts.7.gz
+share/man/man7/zfsprops.7.gz
+share/man/man7/zpool-features.7.gz
+share/man/man7/zpoolconcepts.7.gz
+share/man/man7/zpoolprops.7.gz
+share/man/man8/fsck.zfs.8.gz
+share/man/man8/mount.zfs.8.gz
+share/man/man8/vdev_id.8.gz
+share/man/man8/zdb.8.gz
+share/man/man8/zed.8.gz
+share/man/man8/zfs-allow.8.gz
+share/man/man8/zfs-bookmark.8.gz
+share/man/man8/zfs-change-key.8.gz
+share/man/man8/zfs-clone.8.gz
+share/man/man8/zfs-create.8.gz
+share/man/man8/zfs-destroy.8.gz
+share/man/man8/zfs-diff.8.gz
+share/man/man8/zfs-get.8.gz
+share/man/man8/zfs-groupspace.8.gz
+share/man/man8/zfs-hold.8.gz
+share/man/man8/zfs-inherit.8.gz
+share/man/man8/zfs-jail.8.gz
+share/man/man8/zfs-list.8.gz
+share/man/man8/zfs-load-key.8.gz
+share/man/man8/zfs-mount-generator.8.gz
+share/man/man8/zfs-mount.8.gz
+share/man/man8/zfs-program.8.gz
+share/man/man8/zfs-project.8.gz
+share/man/man8/zfs-projectspace.8.gz
+share/man/man8/zfs-promote.8.gz
+share/man/man8/zfs-receive.8.gz
+share/man/man8/zfs-recv.8.gz
+share/man/man8/zfs-redact.8.gz
+share/man/man8/zfs-release.8.gz
+share/man/man8/zfs-rename.8.gz
+share/man/man8/zfs-rollback.8.gz
+share/man/man8/zfs-send.8.gz
+share/man/man8/zfs-set.8.gz
+share/man/man8/zfs-share.8.gz
+share/man/man8/zfs-snapshot.8.gz
+share/man/man8/zfs-unallow.8.gz
+share/man/man8/zfs-unjail.8.gz
+share/man/man8/zfs-unload-key.8.gz
+share/man/man8/zfs-unmount.8.gz
+share/man/man8/zfs-upgrade.8.gz
+share/man/man8/zfs-userspace.8.gz
+share/man/man8/zfs-wait.8.gz
+share/man/man8/zfs.8.gz
+share/man/man8/zfs_ids_to_path.8.gz
+share/man/man8/zfs_prepare_disk.8.gz
+share/man/man8/zgenhostid.8.gz
+share/man/man8/zinject.8.gz
+share/man/man8/zpool-add.8.gz
+share/man/man8/zpool-attach.8.gz
+share/man/man8/zpool-checkpoint.8.gz
+share/man/man8/zpool-clear.8.gz
+share/man/man8/zpool-create.8.gz
+share/man/man8/zpool-destroy.8.gz
+share/man/man8/zpool-detach.8.gz
+share/man/man8/zpool-events.8.gz
+share/man/man8/zpool-export.8.gz
+share/man/man8/zpool-get.8.gz
+share/man/man8/zpool-history.8.gz
+share/man/man8/zpool-import.8.gz
+share/man/man8/zpool-initialize.8.gz
+share/man/man8/zpool-iostat.8.gz
+share/man/man8/zpool-labelclear.8.gz
+share/man/man8/zpool-list.8.gz
+share/man/man8/zpool-offline.8.gz
+share/man/man8/zpool-online.8.gz
+share/man/man8/zpool-reguid.8.gz
+share/man/man8/zpool-remove.8.gz
+share/man/man8/zpool-reopen.8.gz
+share/man/man8/zpool-replace.8.gz
+share/man/man8/zpool-resilver.8.gz
+share/man/man8/zpool-scrub.8.gz
+share/man/man8/zpool-set.8.gz
+share/man/man8/zpool-split.8.gz
+share/man/man8/zpool-status.8.gz
+share/man/man8/zpool-sync.8.gz
+share/man/man8/zpool-trim.8.gz
+share/man/man8/zpool-upgrade.8.gz
+share/man/man8/zpool-wait.8.gz
+share/man/man8/zpool.8.gz
+share/man/man8/zpool_influxdb.8.gz
+share/man/man8/zstream.8.gz
+share/man/man8/zstreamdump.8.gz
 share/pam-configs/zfs_key
 %%TESTS%%share/zfs/common.sh
 %%TESTS%%share/zfs/compatibility.d/2018



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403111635.42BGZMCs034850>