From nobody Sun Jan 21 15:03:42 2024 X-Original-To: dev-commits-ports-main@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 4THxSb0nFZz57cFQ; Sun, 21 Jan 2024 15:03:43 +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 4THxSb0Fpmz4j2J; Sun, 21 Jan 2024 15:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705849423; 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=JhDI9PxFhMh6SN38wbMja9FLSOqcw2frnRu6Z6oJXdY=; b=rCwzzBbGtfFeuqLuvg0E1QZkZurS19etZgsrGoMYaV6/I42cwGilw4Knyriy9IlZAm/Bj3 GCaSVccg+efh4Q/cZ1bVEQWssmSs9xulwhKAmlb/s+vsKwQz6mQDkgNVhXfjrgrOkY1bdD 3hpVrU8LgC22x0MfONY1J3Cy5bLAudkRcRdoji3nACeU9nB/Tmy4TMiEqdbjvX2dDd8jbm Lcuu1bNYHl5sPmI2MxK67b5h1jD3lM28+Nmdp0iRGBEzlMebgHT3UA0m9Ecg8aCggcEEsm uP2fD02i6KFAznkf6sYy+kjW9Uzo5q6j4i7Adp1DdtcSVJR+nwLvbK7qUbij+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705849423; 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=JhDI9PxFhMh6SN38wbMja9FLSOqcw2frnRu6Z6oJXdY=; b=J+RRZBqP48VXxc6hHHe8SuMzaZ5PTT1h3bscUrZ2yL4v+WmSePSomBc0hnW6LvpKRNjyJs Yarbd4VJ6HSvke0yNPWWBHQHzjUUzy1dQt2ZKn/tXr5e5bbAXIbzW3dFNWKJigTynpKIks KoGdsMwfIQ8AcQGe5EcQmkNYy9pR9eAulu49R1qMz/3f6XsEAeXoYHE5Uz9eyd5cYnDFoc KkqSZocfe5Qorkw8HW7GF/uC5946fjOn1SMA/o+V5MxKAqsN5FLCgxpblkLGbPgO4t+Bq2 XhJi6XaGo5DCPwA3a2/JbyZByVI+TTMh2bglhCURJdKF0A9flZctRpctV4oCpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705849423; a=rsa-sha256; cv=none; b=x2uee8Q/zprdFSxjCZREI4rMAEWelaJyW0bQI9TtWH8f8cgFp/2L72rN59r3ScMUl76DJN Iu0RUw1v/vu2IauzgWV/0MYzXLAH2KS0RFyRw2iQbphfnYqpBNcACkfkZcTeBF7zdipBNb 8WWI6dDmCDtlPwFEFuOpckde48ec+mi48eiGe4IO8ZxxZLMscndGn3AiCLupHZOBO6bxYA Vu69VZjjhDE9ZrKMPC72DeKZXv5G4dgSpTibou+4LjZl3lu4bmF4ZJuV0/wriluHLgC4rm V61grZgF5MDBm2Aj1fOlbYTihZjEFft/p6lUUNwt0sayk78sLEftI6ig2JgBRA== 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 4THxSZ6QChzNF8; Sun, 21 Jan 2024 15:03:42 +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 40LF3grO029229; Sun, 21 Jan 2024 15:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40LF3gvk029226; Sun, 21 Jan 2024 15:03:42 GMT (envelope-from git) Date: Sun, 21 Jan 2024 15:03:42 GMT Message-Id: <202401211503.40LF3gvk029226@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: 2f364c65c96a - main - databases/pgbarman: clean up manpages List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f364c65c96a1f2a48f48e29d7c135a16c4c3c2b Auto-Submitted: auto-generated The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f364c65c96a1f2a48f48e29d7c135a16c4c3c2b commit 2f364c65c96a1f2a48f48e29d7c135a16c4c3c2b Author: Matthew Seaman AuthorDate: 2024-01-21 15:01:12 +0000 Commit: Matthew Seaman CommitDate: 2024-01-21 15:03:40 +0000 databases/pgbarman: clean up manpages Delete files/patch-setup.py, thus restoring the upstream default of installing into .../share/man Regenerate patches. --- databases/pgbarman/Makefile | 1 + databases/pgbarman/files/patch-barman_config.py | 4 ++-- databases/pgbarman/files/patch-doc_barman.5 | 8 ++++---- databases/pgbarman/files/patch-doc_barman.conf | 4 ++-- databases/pgbarman/files/patch-setup.py | 20 -------------------- 5 files changed, 9 insertions(+), 28 deletions(-) diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile index 27e7ddb610dd..3e5477578825 100644 --- a/databases/pgbarman/Makefile +++ b/databases/pgbarman/Makefile @@ -1,6 +1,7 @@ PORTNAME= barman DISTVERSIONPREFIX= release/ DISTVERSION= 3.9.0 +PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= pg PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} diff --git a/databases/pgbarman/files/patch-barman_config.py b/databases/pgbarman/files/patch-barman_config.py index 3d22d892e578..f5ff6b265be0 100644 --- a/databases/pgbarman/files/patch-barman_config.py +++ b/databases/pgbarman/files/patch-barman_config.py @@ -1,6 +1,6 @@ ---- barman/config.py.orig 2021-12-01 11:09:36 UTC +--- barman/config.py.orig 2023-10-03 12:56:33 UTC +++ barman/config.py -@@ -661,8 +661,8 @@ class Config(object): +@@ -802,8 +802,8 @@ class Config(object): CONFIG_FILES = [ "~/.barman.conf", diff --git a/databases/pgbarman/files/patch-doc_barman.5 b/databases/pgbarman/files/patch-doc_barman.5 index abaa27b7fbed..2f63c46013e8 100644 --- a/databases/pgbarman/files/patch-doc_barman.5 +++ b/databases/pgbarman/files/patch-doc_barman.5 @@ -1,4 +1,4 @@ ---- doc/barman.5.orig 2021-12-01 11:09:36 UTC +--- doc/barman.5.orig 2023-10-03 12:56:33 UTC +++ doc/barman.5 @@ -17,7 +17,7 @@ The system\-level Barman configuration file is located .IP @@ -18,7 +18,7 @@ \f[] .fi .PP -@@ -51,9 +51,9 @@ configurations. +@@ -51,9 +51,9 @@ that folder. If the value of \f[C]configuration_files_directory\f[] is a directory, Barman reads all files with \f[C]\&.conf\f[] extension that exist in that folder. @@ -30,7 +30,7 @@ .SH OPTIONS .TP .B active -@@ -851,7 +851,7 @@ Here is an example of configuration file: +@@ -1082,7 +1082,7 @@ Here is an example of configuration file: \f[C] [barman] ;\ Main\ directory @@ -39,7 +39,7 @@ ;\ System\ user barman_user\ =\ barman -@@ -871,13 +871,13 @@ reuse_backup\ =\ link +@@ -1102,13 +1102,13 @@ description\ =\ \ "Main\ PostgreSQL\ Database" description\ =\ \ "Main\ PostgreSQL\ Database" ;\ SSH\ options diff --git a/databases/pgbarman/files/patch-doc_barman.conf b/databases/pgbarman/files/patch-doc_barman.conf index bc97a103b353..b2993aff915d 100644 --- a/databases/pgbarman/files/patch-doc_barman.conf +++ b/databases/pgbarman/files/patch-doc_barman.conf @@ -1,6 +1,6 @@ ---- doc/barman.conf.orig 2016-09-23 12:56:55 UTC +--- doc/barman.conf.orig 2023-10-03 12:56:33 UTC +++ doc/barman.conf -@@ -8,11 +8,11 @@ +@@ -8,11 +8,11 @@ barman_user = barman barman_user = barman ; Directory of configuration files. Place your sections in separate files with .conf extension diff --git a/databases/pgbarman/files/patch-setup.py b/databases/pgbarman/files/patch-setup.py deleted file mode 100644 index 4c4266d4ee38..000000000000 --- a/databases/pgbarman/files/patch-setup.py +++ /dev/null @@ -1,20 +0,0 @@ ---- setup.py.orig 2021-12-01 11:09:36 UTC -+++ setup.py -@@ -61,7 +61,7 @@ setup( - packages=find_packages(exclude=["tests"]), - data_files=[ - ( -- "share/man/man1", -+ "man/man1", - [ - "doc/barman.1", - "doc/barman-cloud-backup.1", -@@ -73,7 +73,7 @@ setup( - "doc/barman-wal-restore.1", - ], - ), -- ("share/man/man5", ["doc/barman.5"]), -+ ("man/man5", ["doc/barman.5"]), - ], - entry_points={ - "console_scripts": [