Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Mar 2024 13:35:18 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: 423d988d7777 - main - sysutils/bacula*: Move manpages to share/man
Message-ID:  <202403171335.42HDZI9g027673@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=423d988d7777e05d19e1cb79719c767286645496

commit 423d988d7777e05d19e1cb79719c767286645496
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-03-17 13:33:49 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-03-17 13:34:08 +0000

    sysutils/bacula*: Move manpages to share/man
    
    Approved by:    portmgr (blanket)
---
 sysutils/bacula11-server/Makefile         |  3 ++-
 sysutils/bacula11-server/Makefile.common  |  2 +-
 sysutils/bacula11-server/pkg-plist        | 26 +++++++++++++-------------
 sysutils/bacula11-server/pkg-plist.client |  6 +++---
 sysutils/bacula13-server/Makefile         |  2 ++
 sysutils/bacula13-server/Makefile.common  |  2 +-
 sysutils/bacula13-server/pkg-plist        | 26 +++++++++++++-------------
 sysutils/bacula13-server/pkg-plist.client |  6 +++---
 sysutils/bacula9-server/Makefile          |  3 ++-
 sysutils/bacula9-server/Makefile.common   |  2 +-
 sysutils/bacula9-server/pkg-plist         | 26 +++++++++++++-------------
 sysutils/bacula9-server/pkg-plist.client  |  6 +++---
 12 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile
index dd19d42526a4..fee8e8120fba 100644
--- a/sysutils/bacula11-server/Makefile
+++ b/sysutils/bacula11-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 PORTVERSION=	11.0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -26,6 +26,7 @@ GROUPS=		${USERS}
 PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/bacula11-server/Makefile.common b/sysutils/bacula11-server/Makefile.common
index a31a5a47640e..e8d846d85acd 100644
--- a/sysutils/bacula11-server/Makefile.common
+++ b/sysutils/bacula11-server/Makefile.common
@@ -10,7 +10,7 @@ do-install:
 # Install config files and preserve existing ones
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bacula/bat.conf.sample
-	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/sbin
 .endif
 .if ${PKGNAMEPREFIX} == "nagios-check_"
diff --git a/sysutils/bacula11-server/pkg-plist b/sysutils/bacula11-server/pkg-plist
index ee9a5ad31966..d84605db6a84 100644
--- a/sysutils/bacula11-server/pkg-plist
+++ b/sysutils/bacula11-server/pkg-plist
@@ -80,17 +80,17 @@ sbin/dbcheck
 %%SQLITE3%%%%DATADIR%%/update_sqlite3_tables
 @owner
 @group
-man/man1/bsmtp.1.gz
-man/man1/bacula-tray-monitor.1.gz
-man/man8/bacula-dir.8.gz
-man/man8/bacula-sd.8.gz
-man/man8/bcopy.8.gz
-man/man8/bextract.8.gz
-man/man8/bls.8.gz
-man/man8/bregex.8.gz
-man/man8/bscan.8.gz
-man/man8/btape.8.gz
-man/man8/btraceback.8.gz
-man/man8/bwild.8.gz
-man/man8/dbcheck.8.gz
+share/man/man1/bsmtp.1.gz
+share/man/man1/bacula-tray-monitor.1.gz
+share/man/man8/bacula-dir.8.gz
+share/man/man8/bacula-sd.8.gz
+share/man/man8/bcopy.8.gz
+share/man/man8/bextract.8.gz
+share/man/man8/bls.8.gz
+share/man/man8/bregex.8.gz
+share/man/man8/bscan.8.gz
+share/man/man8/btape.8.gz
+share/man/man8/btraceback.8.gz
+share/man/man8/bwild.8.gz
+share/man/man8/dbcheck.8.gz
 @dir(bacula,bacula,)  %%BACULA_DIR%%
diff --git a/sysutils/bacula11-server/pkg-plist.client b/sysutils/bacula11-server/pkg-plist.client
index e32392a52f5c..9f331e1bdee7 100644
--- a/sysutils/bacula11-server/pkg-plist.client
+++ b/sysutils/bacula11-server/pkg-plist.client
@@ -7,9 +7,6 @@ lib/libbaccfg.so
 lib/libbacfind-%%LIB_VERSION%%.so
 lib/libbacfind.so
 lib/bpipe-fd.so
-man/man8/bacula.8.gz
-man/man8/bacula-fd.8.gz
-man/man8/bconsole.8.gz
 sbin/bacula-fd
 sbin/bbconsjson
 sbin/bfdjson
@@ -18,3 +15,6 @@ sbin/bfdjson
 @dir share/bacula
 @dir(,bacula,) %%ETCDIR%%
 @sample(,bacula,644) share/bacula/query.sql.sample
+share/man/man8/bacula.8.gz
+share/man/man8/bacula-fd.8.gz
+share/man/man8/bconsole.8.gz
diff --git a/sysutils/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile
index 995599ad9ca5..bf37e2227b3b 100644
--- a/sysutils/bacula13-server/Makefile
+++ b/sysutils/bacula13-server/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bacula
 DISTVERSION=	13.0.4
+PORTREVISION=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -25,6 +26,7 @@ GROUPS=		${USERS}
 PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/bacula13-server/Makefile.common b/sysutils/bacula13-server/Makefile.common
index a31a5a47640e..e8d846d85acd 100644
--- a/sysutils/bacula13-server/Makefile.common
+++ b/sysutils/bacula13-server/Makefile.common
@@ -10,7 +10,7 @@ do-install:
 # Install config files and preserve existing ones
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bacula/bat.conf.sample
-	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/sbin
 .endif
 .if ${PKGNAMEPREFIX} == "nagios-check_"
diff --git a/sysutils/bacula13-server/pkg-plist b/sysutils/bacula13-server/pkg-plist
index ee9a5ad31966..d84605db6a84 100644
--- a/sysutils/bacula13-server/pkg-plist
+++ b/sysutils/bacula13-server/pkg-plist
@@ -80,17 +80,17 @@ sbin/dbcheck
 %%SQLITE3%%%%DATADIR%%/update_sqlite3_tables
 @owner
 @group
-man/man1/bsmtp.1.gz
-man/man1/bacula-tray-monitor.1.gz
-man/man8/bacula-dir.8.gz
-man/man8/bacula-sd.8.gz
-man/man8/bcopy.8.gz
-man/man8/bextract.8.gz
-man/man8/bls.8.gz
-man/man8/bregex.8.gz
-man/man8/bscan.8.gz
-man/man8/btape.8.gz
-man/man8/btraceback.8.gz
-man/man8/bwild.8.gz
-man/man8/dbcheck.8.gz
+share/man/man1/bsmtp.1.gz
+share/man/man1/bacula-tray-monitor.1.gz
+share/man/man8/bacula-dir.8.gz
+share/man/man8/bacula-sd.8.gz
+share/man/man8/bcopy.8.gz
+share/man/man8/bextract.8.gz
+share/man/man8/bls.8.gz
+share/man/man8/bregex.8.gz
+share/man/man8/bscan.8.gz
+share/man/man8/btape.8.gz
+share/man/man8/btraceback.8.gz
+share/man/man8/bwild.8.gz
+share/man/man8/dbcheck.8.gz
 @dir(bacula,bacula,)  %%BACULA_DIR%%
diff --git a/sysutils/bacula13-server/pkg-plist.client b/sysutils/bacula13-server/pkg-plist.client
index e32392a52f5c..9f331e1bdee7 100644
--- a/sysutils/bacula13-server/pkg-plist.client
+++ b/sysutils/bacula13-server/pkg-plist.client
@@ -7,9 +7,6 @@ lib/libbaccfg.so
 lib/libbacfind-%%LIB_VERSION%%.so
 lib/libbacfind.so
 lib/bpipe-fd.so
-man/man8/bacula.8.gz
-man/man8/bacula-fd.8.gz
-man/man8/bconsole.8.gz
 sbin/bacula-fd
 sbin/bbconsjson
 sbin/bfdjson
@@ -18,3 +15,6 @@ sbin/bfdjson
 @dir share/bacula
 @dir(,bacula,) %%ETCDIR%%
 @sample(,bacula,644) share/bacula/query.sql.sample
+share/man/man8/bacula.8.gz
+share/man/man8/bacula-fd.8.gz
+share/man/man8/bconsole.8.gz
diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile
index a76bf3a76332..5f4c25917d68 100644
--- a/sysutils/bacula9-server/Makefile
+++ b/sysutils/bacula9-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 PORTVERSION=	9.6.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -26,6 +26,7 @@ GROUPS=		${USERS}
 PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/bacula9-server/Makefile.common b/sysutils/bacula9-server/Makefile.common
index a4ad34770fed..0208953545a7 100644
--- a/sysutils/bacula9-server/Makefile.common
+++ b/sysutils/bacula9-server/Makefile.common
@@ -10,7 +10,7 @@ do-install:
 # Install config files and preserve existing ones
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bacula/bat.conf.sample
-	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/sbin
 .endif
 .if ${PKGNAMEPREFIX} == "nagios-check_"
diff --git a/sysutils/bacula9-server/pkg-plist b/sysutils/bacula9-server/pkg-plist
index 363305c0b7b1..90589e765599 100644
--- a/sysutils/bacula9-server/pkg-plist
+++ b/sysutils/bacula9-server/pkg-plist
@@ -74,19 +74,19 @@ sbin/dbcheck
 %%MYSQL%%%%DATADIR%%/update_mysql_tables
 %%PGSQL%%%%DATADIR%%/update_postgresql_tables
 %%SQLITE3%%%%DATADIR%%/update_sqlite3_tables
+share/man/man1/bsmtp.1.gz
+share/man/man1/bacula-tray-monitor.1.gz
+share/man/man8/bacula-dir.8.gz
+share/man/man8/bacula-sd.8.gz
+share/man/man8/bcopy.8.gz
+share/man/man8/bextract.8.gz
+share/man/man8/bls.8.gz
+share/man/man8/bregex.8.gz
+share/man/man8/bscan.8.gz
+share/man/man8/btape.8.gz
+share/man/man8/btraceback.8.gz
+share/man/man8/bwild.8.gz
+share/man/man8/dbcheck.8.gz
 @owner
 @group
-man/man1/bsmtp.1.gz
-man/man1/bacula-tray-monitor.1.gz
-man/man8/bacula-dir.8.gz
-man/man8/bacula-sd.8.gz
-man/man8/bcopy.8.gz
-man/man8/bextract.8.gz
-man/man8/bls.8.gz
-man/man8/bregex.8.gz
-man/man8/bscan.8.gz
-man/man8/btape.8.gz
-man/man8/btraceback.8.gz
-man/man8/bwild.8.gz
-man/man8/dbcheck.8.gz
 @dir(bacula,bacula,)  %%BACULA_DIR%%
diff --git a/sysutils/bacula9-server/pkg-plist.client b/sysutils/bacula9-server/pkg-plist.client
index e32392a52f5c..9f331e1bdee7 100644
--- a/sysutils/bacula9-server/pkg-plist.client
+++ b/sysutils/bacula9-server/pkg-plist.client
@@ -7,9 +7,6 @@ lib/libbaccfg.so
 lib/libbacfind-%%LIB_VERSION%%.so
 lib/libbacfind.so
 lib/bpipe-fd.so
-man/man8/bacula.8.gz
-man/man8/bacula-fd.8.gz
-man/man8/bconsole.8.gz
 sbin/bacula-fd
 sbin/bbconsjson
 sbin/bfdjson
@@ -18,3 +15,6 @@ sbin/bfdjson
 @dir share/bacula
 @dir(,bacula,) %%ETCDIR%%
 @sample(,bacula,644) share/bacula/query.sql.sample
+share/man/man8/bacula.8.gz
+share/man/man8/bacula-fd.8.gz
+share/man/man8/bconsole.8.gz



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