git: 78d0d94a0b90 - main - sysutils/*: Move man pages to share/man
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 21 Mar 2024 08:58:45 UTC
The branch main has been updated by naddy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=78d0d94a0b9020ff7a86783383af35f1d4cb4ba0
commit 78d0d94a0b9020ff7a86783383af35f1d4cb4ba0
Author: Christian Weisgerber <naddy@FreeBSD.org>
AuthorDate: 2024-03-21 08:57:58 +0000
Commit: Christian Weisgerber <naddy@FreeBSD.org>
CommitDate: 2024-03-21 08:57:58 +0000
sysutils/*: Move man pages to share/man
Approved by: portmgr (blanket)
---
sysutils/battmond/Makefile | 4 ++--
sysutils/battmond/files/patch-Makefile | 8 ++++----
sysutils/btsixad/Makefile | 5 ++++-
sysutils/dsbmc-cli/Makefile | 5 ++++-
sysutils/egress-monitor/Makefile | 7 +++++--
sysutils/flasher/Makefile | 3 ++-
sysutils/flasher/files/patch-Makefile | 8 ++++----
sysutils/jkill/Makefile | 3 ++-
sysutils/jkill/files/patch-Makefile | 15 ++++++++++++---
sysutils/jps/Makefile | 3 ++-
sysutils/jps/files/patch-Makefile | 15 ++++++++++++---
sysutils/jtop/Makefile | 3 ++-
sysutils/jtop/files/patch-Makefile | 15 ++++++++++++---
sysutils/tdir/Makefile | 3 ++-
sysutils/tdir/files/patch-Makefile | 6 +++---
sysutils/wait_on/Makefile | 5 ++++-
16 files changed, 76 insertions(+), 32 deletions(-)
diff --git a/sysutils/battmond/Makefile b/sysutils/battmond/Makefile
index cd8664af1355..5c2d57152c74 100644
--- a/sysutils/battmond/Makefile
+++ b/sysutils/battmond/Makefile
@@ -1,6 +1,6 @@
PORTNAME= battmond
DISTVERSION= 0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= ntarmos@gmail.com
@@ -15,6 +15,6 @@ GH_TAGNAME= 0.4
PLIST_FILES= sbin/battmond \
etc/rc.d/battmond \
- man/man1/battmond.1.gz
+ share/man/man1/battmond.1.gz
.include <bsd.port.mk>
diff --git a/sysutils/battmond/files/patch-Makefile b/sysutils/battmond/files/patch-Makefile
index 7e777340a3d3..b0d10d097513 100644
--- a/sysutils/battmond/files/patch-Makefile
+++ b/sysutils/battmond/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2019-09-19 13:32:10 UTC
+--- Makefile.orig 2019-09-20 12:27:34 UTC
+++ Makefile
-@@ -14,10 +14,10 @@ battmond: battmond.c
+@@ -14,10 +14,10 @@ install: battmond
${CC} ${CFLAGS} battmond.c -o battmond -lutil
install: battmond
@@ -10,8 +10,8 @@
- gzip -9f ${PREFIX}/man/man1/battmond.1
+ $(INSTALL) -s battmond $(DESTDIR)${PREFIX}/sbin/battmond
+ $(INSTALL) battmond.sh $(DESTDIR)${PREFIX}/etc/rc.d/battmond
-+ $(INSTALL) -c battmond.1 $(DESTDIR)${PREFIX}/man/man1/battmond.1
-+ gzip -9f $(DESTDIR)${PREFIX}/man/man1/battmond.1
++ $(INSTALL) -c battmond.1 $(DESTDIR)${PREFIX}/share/man/man1/battmond.1
++ gzip -9f $(DESTDIR)${PREFIX}/share/man/man1/battmond.1
clean:
rm -f battmond
diff --git a/sysutils/btsixad/Makefile b/sysutils/btsixad/Makefile
index eff3b8ef9a51..92d5896c718e 100644
--- a/sysutils/btsixad/Makefile
+++ b/sysutils/btsixad/Makefile
@@ -1,5 +1,6 @@
PORTNAME= btsixad
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://althenia.net/files/
@@ -11,9 +12,11 @@ LICENSE= BSD2CLAUSE
USES= uidfix
+MAKE_ARGS= MANDIR="${PREFIX}/share/man/man"
+
PLIST_FILES= sbin/btsixad \
etc/rc.d/btsixad \
etc/devd/btsixad.conf \
- man/man8/btsixad.8.gz
+ share/man/man8/btsixad.8.gz
.include <bsd.port.mk>
diff --git a/sysutils/dsbmc-cli/Makefile b/sysutils/dsbmc-cli/Makefile
index a047b7ebe537..fe083ce057fc 100644
--- a/sysutils/dsbmc-cli/Makefile
+++ b/sysutils/dsbmc-cli/Makefile
@@ -1,5 +1,6 @@
PORTNAME= dsbmc-cli
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://freeshell.de/~mk/download/
@@ -14,6 +15,8 @@ RUN_DEPENDS= dsbmd>=0.3:sysutils/dsbmd
USES= tar:tgz
-PLIST_FILES= bin/dsbmc-cli man/man1/dsbmc-cli.1.gz
+MAKE_ARGS= MANDIR="${PREFIX}/share/man/man1"
+
+PLIST_FILES= bin/dsbmc-cli share/man/man1/dsbmc-cli.1.gz
.include <bsd.port.mk>
diff --git a/sysutils/egress-monitor/Makefile b/sysutils/egress-monitor/Makefile
index 9ceb2586f410..d068fbfb8b2d 100644
--- a/sysutils/egress-monitor/Makefile
+++ b/sysutils/egress-monitor/Makefile
@@ -1,5 +1,6 @@
PORTNAME= egress-monitor
DISTVERSION= 0.0.5
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= meka@tilda.center
@@ -16,7 +17,9 @@ SUB_FILES= pkg-message
USE_GITHUB= yes
GH_ACCOUNT= mekanix
-PLIST_FILES= man/man1/egress-monitor.1.gz \
- sbin/egress-monitor
+MAKE_ARGS= MANDIR="${PREFIX}/share/man/man"
+
+PLIST_FILES= sbin/egress-monitor \
+ share/man/man1/egress-monitor.1.gz
.include <bsd.port.mk>
diff --git a/sysutils/flasher/Makefile b/sysutils/flasher/Makefile
index 77d42fb18f35..c2ef491c9c59 100644
--- a/sysutils/flasher/Makefile
+++ b/sysutils/flasher/Makefile
@@ -1,5 +1,6 @@
PORTNAME= flasher
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.unixporting.com/downloads/flasher/
@@ -7,6 +8,6 @@ MAINTAINER= freebsd@nesbitt.ca
COMMENT= Monitors log or mail files for writes, and flashes a keyboard LED
WWW= http://www.unixporting.com/downloads/flasher/
-PLIST_FILES= sbin/flasher man/man1/flasher.1.gz
+PLIST_FILES= sbin/flasher share/man/man1/flasher.1.gz
.include <bsd.port.mk>
diff --git a/sysutils/flasher/files/patch-Makefile b/sysutils/flasher/files/patch-Makefile
index be95ea4770ad..e40648bbada5 100644
--- a/sysutils/flasher/files/patch-Makefile
+++ b/sysutils/flasher/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig 2002-07-03 13:22:08.000000000 +0800
-+++ Makefile 2014-06-27 00:45:38.945108983 +0800
+--- Makefile.orig 2002-07-03 05:22:08 UTC
++++ Makefile
@@ -1,8 +1,8 @@
-CFLAGS = -Wall -O
@@ -12,14 +12,14 @@
all: flasher man
-@@ -16,8 +16,8 @@ man: flasher.1.gz
+@@ -16,8 +16,8 @@ install: flasher man
install: flasher man
strip flasher
- install flasher $(DESTDIR)/sbin/flasher
- install flasher.1.gz $(DESTDIR)/man/man1
+ install flasher $(DESTDIR)${PREFIX}/sbin/flasher
-+ install flasher.1.gz $(DESTDIR)${PREFIX}/man/man1
++ install flasher.1.gz $(DESTDIR)${PREFIX}/share/man/man1
clean:
rm -f *.o flasher flasher.1.gz
diff --git a/sysutils/jkill/Makefile b/sysutils/jkill/Makefile
index 4e62318bdf0c..a464edf3d9fb 100644
--- a/sysutils/jkill/Makefile
+++ b/sysutils/jkill/Makefile
@@ -1,5 +1,6 @@
PORTNAME= jkill
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://ext.by/jkill/
PKGNAMEPREFIX=
@@ -12,6 +13,6 @@ USES= perl5 shebangfix
USE_PERL5= run
SHEBANG_FILES= jkill.pl
-PLIST_FILES= bin/jkill man/man1/jkill.1.gz
+PLIST_FILES= bin/jkill share/man/man1/jkill.1.gz
.include <bsd.port.mk>
diff --git a/sysutils/jkill/files/patch-Makefile b/sysutils/jkill/files/patch-Makefile
index b28f10f88aa2..b2d794fa0d19 100644
--- a/sysutils/jkill/files/patch-Makefile
+++ b/sysutils/jkill/files/patch-Makefile
@@ -1,6 +1,15 @@
---- Makefile.orig 2014-06-27 11:30:05.064430590 +0800
-+++ Makefile 2014-06-27 11:30:18.895417404 +0800
-@@ -40,8 +40,8 @@ clean:
+--- Makefile.orig 2004-03-24 03:20:43 UTC
++++ Makefile
+@@ -14,7 +14,7 @@ MAN_SFX=1
+ PKG=jkill
+
+ MAN_SFX=1
+-MAN_DIR=man/man1
++MAN_DIR=share/man/man1
+
+ TARGETS=${PKG} ${PKG}.${MAN_SFX}.gz
+
+@@ -40,8 +40,8 @@ install: all
${RM} -rf ${TARGETS}
install: all
diff --git a/sysutils/jps/Makefile b/sysutils/jps/Makefile
index c09c1a450e4c..84ed1fa85b57 100644
--- a/sysutils/jps/Makefile
+++ b/sysutils/jps/Makefile
@@ -1,5 +1,6 @@
PORTNAME= jps
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://ext.by/jps/
@@ -13,7 +14,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS_INSTALL= openjdk*
USES= perl5 shebangfix
-PLIST_FILES= bin/jps man/man1/jps.1.gz
+PLIST_FILES= bin/jps share/man/man1/jps.1.gz
SHEBANG_FILES= jps.pl
.include <bsd.port.mk>
diff --git a/sysutils/jps/files/patch-Makefile b/sysutils/jps/files/patch-Makefile
index e2289345bf5b..5866e483a76d 100644
--- a/sysutils/jps/files/patch-Makefile
+++ b/sysutils/jps/files/patch-Makefile
@@ -1,6 +1,15 @@
---- Makefile.orig 2014-06-27 11:33:54.689401738 +0800
-+++ Makefile 2014-06-27 11:34:10.118431813 +0800
-@@ -40,8 +40,8 @@ clean:
+--- Makefile.orig 2004-03-24 03:20:35 UTC
++++ Makefile
+@@ -14,7 +14,7 @@ MAN_SFX=1
+ PKG=jps
+
+ MAN_SFX=1
+-MAN_DIR=man/man1
++MAN_DIR=share/man/man1
+
+ TARGETS=${PKG} ${PKG}.${MAN_SFX}.gz
+
+@@ -40,8 +40,8 @@ install: all
${RM} -rf ${TARGETS}
install: all
diff --git a/sysutils/jtop/Makefile b/sysutils/jtop/Makefile
index c6245525c15f..38e13c93eed2 100644
--- a/sysutils/jtop/Makefile
+++ b/sysutils/jtop/Makefile
@@ -1,5 +1,6 @@
PORTNAME= jtop
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://ext.by/jtop/
@@ -11,7 +12,7 @@ BUILD_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 shebangfix
-PLIST_FILES= bin/jtop man/man1/jtop.1.gz
+PLIST_FILES= bin/jtop share/man/man1/jtop.1.gz
SHEBANG_FILES= jtop.pl
.include <bsd.port.mk>
diff --git a/sysutils/jtop/files/patch-Makefile b/sysutils/jtop/files/patch-Makefile
index 8d081fe0f709..eeabc4b8112a 100644
--- a/sysutils/jtop/files/patch-Makefile
+++ b/sysutils/jtop/files/patch-Makefile
@@ -1,6 +1,15 @@
---- Makefile.orig 2014-06-27 11:43:49.474359774 +0800
-+++ Makefile 2014-06-27 11:44:04.348361308 +0800
-@@ -40,8 +40,8 @@ clean:
+--- Makefile.orig 2004-03-24 04:54:58 UTC
++++ Makefile
+@@ -14,7 +14,7 @@ MAN_SFX=1
+ PKG=jtop
+
+ MAN_SFX=1
+-MAN_DIR=man/man1
++MAN_DIR=share/man/man1
+
+ TARGETS=${PKG} ${PKG}.${MAN_SFX}.gz
+
+@@ -40,8 +40,8 @@ install: all
${RM} -rf ${TARGETS}
install: all
diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile
index c682c4ae6a42..44cb580e2b9d 100644
--- a/sysutils/tdir/Makefile
+++ b/sysutils/tdir/Makefile
@@ -1,5 +1,6 @@
PORTNAME= tdir
PORTVERSION= 1.73
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.tundraware.com/Software/tdir/
@@ -16,6 +17,6 @@ SHEBANG_FILES= tdir
NO_ARCH= yes
PLIST_FILES= bin/tdir \
- man/man1/tdir.1.gz
+ share/man/man1/tdir.1.gz
.include <bsd.port.mk>
diff --git a/sysutils/tdir/files/patch-Makefile b/sysutils/tdir/files/patch-Makefile
index 76848f8fb2a2..65d80ab9fcea 100644
--- a/sysutils/tdir/files/patch-Makefile
+++ b/sysutils/tdir/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2014-02-12 18:24:13 UTC
+--- Makefile.orig 2018-05-11 21:42:28 UTC
+++ Makefile
-@@ -3,8 +3,5 @@
+@@ -3,8 +3,5 @@ install:
all: # Do nothing - this is a python script that needs no build
install:
@@ -10,4 +10,4 @@
- install -c -o root -g wheel -m 644 ./tdir-license.txt ${PREFIX}/share/doc/tdir
-
+ ${BSD_INSTALL_SCRIPT} ./tdir ${DESTDIR}${PREFIX}/bin
-+ ${BSD_INSTALL_MAN} ./tdir.1.gz ${DESTDIR}${PREFIX}/man/man1
++ ${BSD_INSTALL_MAN} ./tdir.1.gz ${DESTDIR}${PREFIX}/share/man/man1
diff --git a/sysutils/wait_on/Makefile b/sysutils/wait_on/Makefile
index 15ead2def35d..31eb96c68970 100644
--- a/sysutils/wait_on/Makefile
+++ b/sysutils/wait_on/Makefile
@@ -1,6 +1,7 @@
PORTNAME= wait_on
DISTVERSION= 1.1-2
DISTVERSIONSUFFIX= -g2fb6f24
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= jcpierri@gmail.com
@@ -13,6 +14,8 @@ USES= uidfix
USE_GITHUB= yes
GH_ACCOUNT= jcpierri
-PLIST_FILES= bin/wait_on man/man1/wait_on.1.gz
+MAKE_ARGS= MANDIR="${PREFIX}/share/man/man"
+
+PLIST_FILES= bin/wait_on share/man/man1/wait_on.1.gz
.include <bsd.port.mk>