From owner-svn-ports-all@FreeBSD.ORG Sat May 24 14:11:51 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8A66F791; Sat, 24 May 2014 14:11:51 +0000 (UTC) Received: from svn.freebsd.org (svn.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 77A152F15; Sat, 24 May 2014 14:11:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4OEBp29018278; Sat, 24 May 2014 14:11:51 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4OEBox1018271; Sat, 24 May 2014 14:11:50 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201405241411.s4OEBox1018271@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sat, 24 May 2014 14:11:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355026 - in head/databases/postgresql-repmgr: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 14:11:51 -0000 Author: sunpoet Date: Sat May 24 14:11:50 2014 New Revision: 355026 URL: http://svnweb.freebsd.org/changeset/ports/355026 QAT: https://qat.redports.org/buildarchive/r355026/ Log: - Update to 2.0 - Pass maintainership to submitter Changes: http://www.repmgr.org/release-notes-2.0.html PR: ports/189775 Submitted by: Muhammad Moinur Rahman <5u623l20@gmail.com> Modified: head/databases/postgresql-repmgr/Makefile head/databases/postgresql-repmgr/distinfo head/databases/postgresql-repmgr/files/patch-repmgr.c head/databases/postgresql-repmgr/pkg-plist Modified: head/databases/postgresql-repmgr/Makefile ============================================================================== --- head/databases/postgresql-repmgr/Makefile Sat May 24 14:11:44 2014 (r355025) +++ head/databases/postgresql-repmgr/Makefile Sat May 24 14:11:50 2014 (r355026) @@ -2,19 +2,19 @@ # $FreeBSD$ PORTNAME= postgresql-repmgr -PORTVERSION= 1.2.0 +PORTVERSION= 2.0 CATEGORIES= databases MASTER_SITES= http://www.repmgr.org/download/ DISTNAME= repmgr-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= 5u623l20@gmail.com COMMENT= PostgreSQL replication manager LICENSE= GPLv3 RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync -USES= gmake +USES= gmake USE_PGSQL= yes WANT_PGSQL_VER= 90+ MAKE_ENV= USE_PGXS=1 @@ -29,7 +29,7 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/repmgr.conf ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/repmgr.conf.sample ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/repmgr.sql ${STAGEDIR}${DATADIR} .include Modified: head/databases/postgresql-repmgr/distinfo ============================================================================== --- head/databases/postgresql-repmgr/distinfo Sat May 24 14:11:44 2014 (r355025) +++ head/databases/postgresql-repmgr/distinfo Sat May 24 14:11:50 2014 (r355026) @@ -1,2 +1,2 @@ -SHA256 (repmgr-1.2.0.tar.gz) = 191c077a15b9f7fa729b8f1c4e5ace8b340fda6285c7b552545f94ca4490ec5b -SIZE (repmgr-1.2.0.tar.gz) = 51608 +SHA256 (repmgr-2.0.tar.gz) = b891d8a98700f73a58ce9580377978a1e43834f3bdcf6992e565b4aacddee887 +SIZE (repmgr-2.0.tar.gz) = 72227 Modified: head/databases/postgresql-repmgr/files/patch-repmgr.c ============================================================================== --- head/databases/postgresql-repmgr/files/patch-repmgr.c Sat May 24 14:11:44 2014 (r355025) +++ head/databases/postgresql-repmgr/files/patch-repmgr.c Sat May 24 14:11:50 2014 (r355026) @@ -1,35 +1,6 @@ ---- ./repmgr.c.orig 2012-07-28 02:30:35.000000000 +1000 -+++ ./repmgr.c 2012-12-04 19:41:06.157429458 +1100 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - #include - #include - -@@ -1603,11 +1604,18 @@ - char script[MAXLEN]; - int r; - -+/* On some OS, true is located in a different place than in Linux */ -+#ifdef __FreeBSD__ -+#define TRUEBIN_PATH "/usr/bin/true" -+#else -+#define TRUEBIN_PATH "/bin/true" -+#endif -+ - /* Check if we have ssh connectivity to host before trying to rsync */ - if (!remote_user[0]) -- maxlen_snprintf(script, "ssh -o Batchmode=yes %s /bin/true", host); -+ maxlen_snprintf(script, "ssh -o Batchmode=yes %s %s", host, TRUEBIN_PATH); - else -- maxlen_snprintf(script, "ssh -o Batchmode=yes %s -l %s /bin/true", host, remote_user); -+ maxlen_snprintf(script, "ssh -o Batchmode=yes %s -l %s %s", host, remote_user, TRUEBIN_PATH); - - log_debug(_("command is: %s"), script); - r = system(script); -@@ -1625,7 +1633,7 @@ +--- repmgr.c.orig 2014-03-17 21:27:40.000000000 +0800 ++++ repmgr.c 2014-05-24 17:55:10.996404127 +0800 +@@ -1871,7 +1871,7 @@ char host_string[MAXLEN]; int r; Modified: head/databases/postgresql-repmgr/pkg-plist ============================================================================== --- head/databases/postgresql-repmgr/pkg-plist Sat May 24 14:11:44 2014 (r355025) +++ head/databases/postgresql-repmgr/pkg-plist Sat May 24 14:11:50 2014 (r355026) @@ -1,5 +1,5 @@ bin/repmgr sbin/repmgrd -%%PORTDATA%%%%DATADIR%%/repmgr.conf +%%PORTDATA%%%%DATADIR%%/repmgr.conf.sample %%PORTDATA%%%%DATADIR%%/repmgr.sql %%PORTDATA%%@dirrm %%DATADIR%%