Re: git: fa71e5ae6caa - main - sysutils/bacula15-{client*,server}: Move man pages to share/man
Date: Tue, 02 Apr 2024 15:16:11 UTC
My apologies.
arrowd@ had already done 'sysutils/bacula*: Move manpages to share/man' via 423d988d7777e05d19e1cb79719c767286645496 on 2024-03-17
I started my bacula15 work before that and did not catch up.
Thank you for fixing it.
On Sat, Mar 30, 2024, at 6:02 AM, Yasuhiro Kimura wrote:
> The branch main has been updated by yasu:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=fa71e5ae6caaf44d0b5342e317405e3ad09f408c
>
> commit fa71e5ae6caaf44d0b5342e317405e3ad09f408c
> Author: Yasuhiro Kimura <yasu@FreeBSD.org>
> AuthorDate: 2024-03-30 09:55:26 +0000
> Commit: Yasuhiro Kimura <yasu@FreeBSD.org>
> CommitDate: 2024-03-30 10:01:35 +0000
>
> sysutils/bacula15-{client*,server}: Move man pages to share/man
>
> Fix the definition of LIB_VERSION. Since PKGVERSION includes
> PORTREVISION, the value of the former changes when the latter is
> bumped. So use DISTVERSION instead.
>
> Approved by: portmgr (blanket, just fix it)
> ---
> sysutils/bacula15-server/Makefile | 4 +++-
> sysutils/bacula15-server/pkg-plist | 26 +++++++++++++-------------
> sysutils/bacula15-server/pkg-plist.client | 6 +++---
> 3 files changed, 19 insertions(+), 17 deletions(-)
>
> diff --git a/sysutils/bacula15-server/Makefile
> b/sysutils/bacula15-server/Makefile
> index 3498fab039a5..533cbaf219a7 100644
> --- a/sysutils/bacula15-server/Makefile
> +++ b/sysutils/bacula15-server/Makefile
> @@ -1,5 +1,6 @@
> PORTNAME= bacula
> DISTVERSION= 15.0.2
> +PORTREVISION= 1
> CATEGORIES?= sysutils
> MASTER_SITES= SF/bacula/bacula/${DISTVERSION}
> PKGNAMEPREFIX?= #
> @@ -25,11 +26,12 @@ LIB_DEPENDS+= liblzo2.so:archivers/lzo2
> USERS= bacula
> GROUPS= ${USERS}
>
> -LIB_VERSION= ${PKGVERSION}
> +LIB_VERSION= ${DISTVERSION}
>
> PLIST_SUB+= LIB_VERSION=${LIB_VERSION}
>
> GNU_CONFIGURE= yes
> +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
> USE_LDCONFIG= yes
>
> OPTIONS_DEFINE?= IPV6 MTX NLS S3
> diff --git a/sysutils/bacula15-server/pkg-plist
> b/sysutils/bacula15-server/pkg-plist
> index fab74ad77289..771a6f86b653 100644
> --- a/sysutils/bacula15-server/pkg-plist
> +++ b/sysutils/bacula15-server/pkg-plist
> @@ -84,17 +84,17 @@ sbin/md5tobase64.py
> %%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/bacula15-server/pkg-plist.client
> b/sysutils/bacula15-server/pkg-plist.client
> index e32392a52f5c..9d95447b410b 100644
> --- a/sysutils/bacula15-server/pkg-plist.client
> +++ b/sysutils/bacula15-server/pkg-plist.client
> @@ -7,9 +7,9 @@ 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
> +share/man/man8/bacula.8.gz
> +share/man/man8/bacula-fd.8.gz
> +share/man/man8/bconsole.8.gz
> sbin/bacula-fd
> sbin/bbconsjson
> sbin/bfdjson
--
Dan Langille
dan@langille.org