From nobody Thu Apr 04 13:20:27 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9MgH3t9Cz5H14x; Thu, 4 Apr 2024 13:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9MgH1dggz48lD; Thu, 4 Apr 2024 13:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712236827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3IHWMIi4niKHyjymRJsieCJBwGb7w93Sqvq1AmqUjI=; b=ib+dhbJh2AZXzEfvIL0Z8wrt/l+oibffJf/T3RDGOUzLOZin8ohRGRuhalVO8HexEm9jbo 8JHLw6nQn2R3ICwrvegLFfw2ls3S8me8PXv/DkScjcra52XTn8FuQry9KKrsOSPYUeulvV Jl0PeEjAObawOqA4rANil3foS3LVui2bOZIWvhTVNzkvT1dxLIZBbjbVgjalz0I+6xSf/x ySlHXzpGdi6XE5wKVCIG2ajSlYaAKUVTH9imnKTGkPt138fhnTyBFC23R2B4LsDaMm2SR8 Ebxxn4jMJlEerkt+un91vFV36qYG+IUJGdm3YAppp+90z/R/iXHdFoa+v+Vp5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712236827; a=rsa-sha256; cv=none; b=X9RbiG6Msel40pOoTTLevqicVOtiJVX9xdL5BAY2qgPlI48X7ErzmdhK8hB+UQO9qmlUSg peNlH/xxcfmH0sAZTklshgqLltjjLg08YmwUgjZoqaUT3oMEuS8ZqHYbF9JIFoWGgjjhFN vC5l9gLu9RPhLCOkIaEUlCJQHyy23EQzVHInClw5vAtGZkm4wLYPmZefoXpB+42NesTivy /HN7sTX9OWdXfga40ofFHzbg4aCirf6rXsy7TWlZ3ElMdZEwbcehXHMWG76bJo7IQFNpxI xEyRVhvMPqQPF1GaJzD4Y0p6UoIMh/BJdgX/b0c8xSoiQFLImA7CnMszGeEUHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712236827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3IHWMIi4niKHyjymRJsieCJBwGb7w93Sqvq1AmqUjI=; b=H+28Z/OCRMgLJLAuKtvA1EEaOdkeN805TZVfR8O/8+z4mMtRumfQ984lx4CAFN08OX+zGm qZPj0PiQa5tO/Bnt/YvN/CHH4M+wyw6EbbwMERB0SLR/AEJ5BjT8yGTsaKtszyCi08TuCy 3Nuxf417viDj04JQ30YcuCOpDJ4596ezuegw6//7G+12LUYYRGL1ZEXO5QpSjHAYRSahrI Nn1+f6urqmW+PdSP8PvLmDWg10bFh1wMNdgj3SdD+CyKxHbcl/gq8TGOd83STgJLXRtgWl S6ltVRGkiHKsK0ydI2VVhnG9lGggVsKSpAfWg8qEsBJivktwpuBC44kK4Eri1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9MgH13VfzJDG; Thu, 4 Apr 2024 13:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434DKRiO038976; Thu, 4 Apr 2024 13:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434DKRPq038973; Thu, 4 Apr 2024 13:20:27 GMT (envelope-from git) Date: Thu, 4 Apr 2024 13:20:27 GMT Message-Id: <202404041320.434DKRPq038973@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 589ca2f8efb7 - main - sysutils/bacula*: Amend CONFLICTS List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 589ca2f8efb79d3fb2c92c3193121c1fa6904523 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=589ca2f8efb79d3fb2c92c3193121c1fa6904523 commit 589ca2f8efb79d3fb2c92c3193121c1fa6904523 Author: Dan Langille AuthorDate: 2024-04-04 13:11:46 +0000 Commit: Dan Langille CommitDate: 2024-04-04 13:19:47 +0000 sysutils/bacula*: Amend CONFLICTS They were out of date: * removed references to bacula-server (long gone) * add bacula15 --- sysutils/bacula11-docs/Makefile | 3 ++- sysutils/bacula11-server/Makefile | 4 ++-- sysutils/bacula13-docs/Makefile | 3 ++- sysutils/bacula13-server/Makefile | 4 ++-- sysutils/bacula15-docs/Makefile | 3 ++- sysutils/bacula15-server/Makefile | 4 ++-- sysutils/bacula9-docs/Makefile | 4 ++-- sysutils/bacula9-server/Makefile | 4 ++-- 8 files changed, 16 insertions(+), 13 deletions(-) diff --git a/sysutils/bacula11-docs/Makefile b/sysutils/bacula11-docs/Makefile index f302fc9e954d..decba1ee535c 100644 --- a/sysutils/bacula11-docs/Makefile +++ b/sysutils/bacula11-docs/Makefile @@ -1,11 +1,12 @@ PORTNAME= bacula PORTVERSION= 11.0.6 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF PKGNAMESUFFIX= 11-docs DISTNAME= ${PORTNAME}-docs-${PORTVERSION} -CONFLICTS= bacula9 +CONFLICTS= bacula15-docs bacula13-docs bacula9-docs MAINTAINER= dvl@FreeBSD.org COMMENT= Bacula document set diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile index 8f4a2e9d636a..1e691d80c2dc 100644 --- a/sysutils/bacula11-server/Makefile +++ b/sysutils/bacula11-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula PORTVERSION= 11.0.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -19,7 +19,7 @@ EXPIRATION_DATE= 2024-09-30 USES+= cpe libtool readline shebangfix ssl SHEBANG_FILES= src/cats/make_catalog_backup.pl.in scripts/baculabackupreport.in -CONFLICTS?= bacula-11-server bacula9-server bacula-server +CONFLICTS?= bacula15-server bacula13-server bacula9-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 diff --git a/sysutils/bacula13-docs/Makefile b/sysutils/bacula13-docs/Makefile index 311d2a603f8e..cb9f84f46cfe 100644 --- a/sysutils/bacula13-docs/Makefile +++ b/sysutils/bacula13-docs/Makefile @@ -1,11 +1,12 @@ PORTNAME= bacula PORTVERSION= 13.0.4 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF PKGNAMESUFFIX= 13-docs DISTNAME= ${PORTNAME}-docs-${PORTVERSION} -CONFLICTS= bacula9 +CONFLICTS= bacula15-docs bacula11-docs bacula9-docs MAINTAINER= dvl@FreeBSD.org COMMENT= Bacula document set diff --git a/sysutils/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile index bf37e2227b3b..b6c42dbef5b6 100644 --- a/sysutils/bacula13-server/Makefile +++ b/sysutils/bacula13-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula DISTVERSION= 13.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES+= cpe libtool readline shebangfix ssl SHEBANG_FILES= src/cats/make_catalog_backup.pl.in scripts/baculabackupreport -CONFLICTS?= bacula11-server bacula9-server bacula-server +CONFLICTS?= bacula15-server bacula11-server bacula9-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 diff --git a/sysutils/bacula15-docs/Makefile b/sysutils/bacula15-docs/Makefile index 7ec0591db3e0..9c0b2f3df8c9 100644 --- a/sysutils/bacula15-docs/Makefile +++ b/sysutils/bacula15-docs/Makefile @@ -1,11 +1,12 @@ PORTNAME= bacula PORTVERSION= 15.0.2 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF PKGNAMESUFFIX= 15-docs DISTNAME= ${PORTNAME}-docs-${PORTVERSION} -CONFLICTS= bacula9 +CONFLICTS= bacula13-docs bacula11-docs bacula9-docs MAINTAINER= dvl@FreeBSD.org COMMENT= Bacula document set diff --git a/sysutils/bacula15-server/Makefile b/sysutils/bacula15-server/Makefile index 533cbaf219a7..6e7aec421cd7 100644 --- a/sysutils/bacula15-server/Makefile +++ b/sysutils/bacula15-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula DISTVERSION= 15.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${DISTVERSION} PKGNAMEPREFIX?= # @@ -19,7 +19,7 @@ SHEBANG_FILES= scripts/get_malware_abuse.ch scripts/key-manager.py.in \ scripts/md5tobase64.py src/cats/make_catalog_backup.pl.in #scripts/baculabackupreport.in -CONFLICTS?= bacula-server bacula13-server bacula11-server bacula9-server +CONFLICTS?= bacula13-server bacula11-server bacula9-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 diff --git a/sysutils/bacula9-docs/Makefile b/sysutils/bacula9-docs/Makefile index 9b3fdb2e5927..931f837139fd 100644 --- a/sysutils/bacula9-docs/Makefile +++ b/sysutils/bacula9-docs/Makefile @@ -1,12 +1,12 @@ PORTNAME= bacula PORTVERSION= 9.6.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF PKGNAMESUFFIX= 9-docs DISTNAME= ${PORTNAME}-docs-${PORTVERSION} -CONFLICTS= bacula bacula11 +CONFLICTS= bacula15-docs bacula13-docs bacula11-docs MAINTAINER= dvl@FreeBSD.org COMMENT= Bacula document set diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile index bdd425560500..54374793f41f 100644 --- a/sysutils/bacula9-server/Makefile +++ b/sysutils/bacula9-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula PORTVERSION= 9.6.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES+= cpe libtool readline shebangfix ssl SHEBANG_FILES= src/cats/make_catalog_backup.pl.in -CONFLICTS?= bacula11-server bacula-server +CONFLICTS?= bacula15-server bacula13-server bacula11-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2