From owner-svn-ports-head@freebsd.org Tue Sep 29 14:24:10 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2BE3A0A1D4; Tue, 29 Sep 2015 14:24:10 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BFBA41A85; Tue, 29 Sep 2015 14:24:10 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8TEOA31014581; Tue, 29 Sep 2015 14:24:10 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8TEO94B014576; Tue, 29 Sep 2015 14:24:09 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201509291424.t8TEO94B014576@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Tue, 29 Sep 2015 14:24:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398180 - in head/databases/pgbarman: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2015 14:24:10 -0000 Author: matthew Date: Tue Sep 29 14:24:09 2015 New Revision: 398180 URL: https://svnweb.freebsd.org/changeset/ports/398180 Log: Update to 1.5.0 - Mark as NO_ARCH=yes - Sort the USES lne contents - Regenerage patches via 'make makepatch' Announcement: http://www.pgbarman.org/barman-1-5-0-released/ ReleaseNotes: http://sourceforge.net/projects/pgbarman/files/1.5.0/ Modified: head/databases/pgbarman/Makefile head/databases/pgbarman/distinfo head/databases/pgbarman/files/patch-barman_config.py head/databases/pgbarman/files/patch-doc_barman.5 Modified: head/databases/pgbarman/Makefile ============================================================================== --- head/databases/pgbarman/Makefile Tue Sep 29 14:04:45 2015 (r398179) +++ head/databases/pgbarman/Makefile Tue Sep 29 14:24:09 2015 (r398180) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= barman -DISTVERSION= 1.4.1 +DISTVERSION= 1.5.0 CATEGORIES= databases MASTER_SITES= SF/${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION} PKGNAMEPREFIX= pg @@ -17,12 +17,15 @@ LICENSE= GPLv3 RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync \ ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}argh>0:${PORTSDIR}/devel/py-argh + ${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:${PORTSDIR}/devel/py-argh \ + ${PYTHON_PKGNAMEPREFIX}argcomplete>0:${PORTSDIR}/devel/py-argcomplete + +NO_ARCH= yes USERS= barman GROUPS= barman -USES= python pgsql +USES= pgsql python WANT_PGSQL= client USE_PYTHON= autoplist distutils Modified: head/databases/pgbarman/distinfo ============================================================================== --- head/databases/pgbarman/distinfo Tue Sep 29 14:04:45 2015 (r398179) +++ head/databases/pgbarman/distinfo Tue Sep 29 14:24:09 2015 (r398180) @@ -1,4 +1,4 @@ -SHA256 (barman-1.4.1.tar.gz) = 38a649ab1cea811e2db9410d87c08423beb3135f88b1160913bcb9f16a10b1df -SIZE (barman-1.4.1.tar.gz) = 122048 +SHA256 (barman-1.5.0.tar.gz) = 21188b11f64dd13e70236456ca7ad43fc21ccb1956e093ced7f8f810b13d972a +SIZE (barman-1.5.0.tar.gz) = 128132 SHA256 (barman-tutorial.en.pdf) = 86464ce9e987897a54386e24abd8a0741db36a34f7025978f7b03d21d664c5c5 SIZE (barman-tutorial.en.pdf) = 280146 Modified: head/databases/pgbarman/files/patch-barman_config.py ============================================================================== --- head/databases/pgbarman/files/patch-barman_config.py Tue Sep 29 14:04:45 2015 (r398179) +++ head/databases/pgbarman/files/patch-barman_config.py Tue Sep 29 14:24:09 2015 (r398180) @@ -1,6 +1,6 @@ ---- barman/config.py.orig 2014-08-01 13:50:46 UTC +--- barman/config.py.orig 2015-09-25 15:06:25 UTC +++ barman/config.py -@@ -341,8 +341,8 @@ class Config(object): +@@ -429,8 +429,8 @@ class Config(object): """ CONFIG_FILES = [ '~/.barman.conf', Modified: head/databases/pgbarman/files/patch-doc_barman.5 ============================================================================== --- head/databases/pgbarman/files/patch-doc_barman.5 Tue Sep 29 14:04:45 2015 (r398179) +++ head/databases/pgbarman/files/patch-doc_barman.5 Tue Sep 29 14:24:09 2015 (r398180) @@ -1,51 +1,54 @@ ---- doc/barman.5.orig 2014-08-18 10:29:45 UTC +--- doc/barman.5.orig 2015-09-25 15:06:25 UTC +++ doc/barman.5 -@@ -37,7 +37,7 @@ The system\-level Barman configuration f - .RS 4 - .\} +@@ -8,7 +8,7 @@ The system\-level Barman configuration f + .IP .nf --/etc/barman\&.conf -+/usr/local/etc/barman\&.conf + \f[C] +-/etc/barman.conf ++/usr/local/etc/barman.conf + \f[] .fi - .if n \{\ - .RE -@@ -49,7 +49,7 @@ or - .RS 4 - .\} + .PP +@@ -16,7 +16,7 @@ or + .IP .nf --/etc/barman/barman\&.conf -+/usr/local/etc/barman/barman\&.conf + \f[C] +-/etc/barman/barman.conf ++/usr/local/etc/barman/barman.conf + \f[] .fi - .if n \{\ - .RE -@@ -71,7 +71,7 @@ $HOME/\&.barman\&.conf - The Barman configuration file is a plain ini file\&. There is a general section called [barman] and a section [servername] for each server you want to backup\&. Rows starting with ; are comments\&. - .SH "CONFIGURATION FILE DIRECTORY" - .sp --Barman supports the inclusion of multiple configuration files, through the configuration_files_directory option\&. Included files must contain only server specifications, not global configurations\&. If the value of configuration_files_directory is a directory, Barman reads all files with \&.conf extension that exist in that folder\&. For example, if you set it to /etc/barman\&.d, you can specify your PostgreSQL servers placing each section in a separate \&.conf file inside the /etc/barman\&.d folder\&. -+Barman supports the inclusion of multiple configuration files, through the configuration_files_directory option\&. Included files must contain only server specifications, not global configurations\&. If the value of configuration_files_directory is a directory, Barman reads all files with \&.conf extension that exist in that folder\&. For example, if you set it to /usr/local/etc/barman\&.d, you can specify your PostgreSQL servers placing each section in a separate \&.conf file inside the /usr/local/etc/barman\&.d folder\&. - .SH "OPTIONS" .PP - \fBactive\fR -@@ -322,7 +322,7 @@ Example of the configuration file: - .nf +@@ -42,9 +42,9 @@ configurations. + 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. +-For example, if you set it to \f[C]/etc/barman.d\f[], you can specify ++For example, if you set it to \f[C]/usr/local/etc/barman.d\f[], you can specify + your PostgreSQL servers placing each section in a separate +-\f[C]\&.conf\f[] file inside the \f[C]/etc/barman.d\f[] folder. ++\f[C]\&.conf\f[] file inside the \f[C]/usr/local/etc/barman.d\f[] folder. + .SH OPTIONS + .TP + .B active +@@ -445,7 +445,7 @@ Here is an example of configuration file + \f[C] [barman] - ; Main directory --barman_home = /var/lib/barman -+barman_home = /var/barman + ;\ Main\ directory +-barman_home\ =\ /var/lib/barman ++barman_home\ =\ /var/barman - ; System user - barman_user = barman -@@ -339,10 +339,10 @@ log_file = /var/log/barman/barman\&.log - description = "Main PostgreSQL Database" + ;\ System\ user + barman_user\ =\ barman +@@ -465,10 +465,10 @@ reuse_backup\ =\ link + description\ =\ \ "Main\ PostgreSQL\ Database" - ; SSH options --ssh_command = ssh postgres@pg -+ssh_command = ssh pgsql@pg + ;\ SSH\ options +-ssh_command\ =\ ssh\ postgres\@pg ++ssh_command\ =\ ssh\ pgsql\@pg - ; PostgreSQL connection string --conninfo = host=pg user=postgres -+conninfo = host=pg user=pgsql dbname=postgres + ;\ PostgreSQL\ connection\ string +-conninfo\ =\ host=pg\ user=postgres ++conninfo\ =\ host=pg\ user=pgsql\ db=postgres - ; Minimum number of required backups (redundancy) - minimum_redundancy = 1 + ;\ Minimum\ number\ of\ required\ backups\ (redundancy) + minimum_redundancy\ =\ 1