From owner-svn-ports-all@freebsd.org Fri Aug 19 10:11:38 2016 Return-Path: Delivered-To: svn-ports-all@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 F0AC5BBF500; Fri, 19 Aug 2016 10:11:38 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C85C51676; Fri, 19 Aug 2016 10:11:38 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JABbTN053099; Fri, 19 Aug 2016 10:11:37 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JABbOo053096; Fri, 19 Aug 2016 10:11:37 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201608191011.u7JABbOo053096@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Fri, 19 Aug 2016 10:11:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420454 - in head/databases/pglogical: . 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.22 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: Fri, 19 Aug 2016 10:11:39 -0000 Author: matthew Date: Fri Aug 19 10:11:37 2016 New Revision: 420454 URL: https://svnweb.freebsd.org/changeset/ports/420454 Log: Install the .sql files for release 1.1.2 -- this is missing from the release tarball, but has been fixed in upstream's Github. Add pglogical_dump, pglogical_origin--1.0.0.sql and pglogical_origin.control conditionally on the postgresql version -- these are only compiled and installed with postgresql-9.4.x Submitted by: Anderson Neves Added: head/databases/pglogical/files/ head/databases/pglogical/files/patch-Makefile (contents, props changed) Modified: head/databases/pglogical/Makefile head/databases/pglogical/pkg-plist (contents, props changed) Modified: head/databases/pglogical/Makefile ============================================================================== --- head/databases/pglogical/Makefile Fri Aug 19 09:41:28 2016 (r420453) +++ head/databases/pglogical/Makefile Fri Aug 19 10:11:37 2016 (r420454) @@ -3,6 +3,7 @@ PORTNAME= pglogical PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://packages.2ndquadrant.com/pglogical/tarballs/ @@ -23,6 +24,14 @@ OPTIONS_DEFINE= DOCS DOCS_PORTDOCS= * +.include + +.if ${PGSQL_VER:M9.4} +PLIST_SUB= PGSQL94="" +.else +PLIST_SUB= PGSQL94="@comment " +.endif + # FFI #TEST_DEPENDS= pg_regress:databases/postgresql${PGSQL_VER_NODOT}-pg_regress #TEST_TARGET= do-test @@ -30,6 +39,9 @@ DOCS_PORTDOCS= * post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pglogical_create_subscriber ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pglogical.so +.if ${PGSQL_VER:M9.4} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pglogical_dump +.endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -38,4 +50,4 @@ post-install-DOCS-on: #do-test: # ${MAKE} ${MAKE_ARGS} check -.include +.include Added: head/databases/pglogical/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/pglogical/files/patch-Makefile Fri Aug 19 10:11:37 2016 (r420454) @@ -0,0 +1,13 @@ +--- Makefile.orig 2016-08-17 20:46:15 UTC ++++ Makefile +@@ -6,7 +6,9 @@ PGFILEDESC = "pglogical - logical replic + + DATA = pglogical--1.0.0.sql pglogical--1.0.1.sql pglogical--1.0.0--1.0.1.sql \ + pglogical--1.1.0.sql pglogical--1.1.1.sql pglogical--1.0.0--1.1.0.sql \ +- pglogical--1.0.1--1.1.0.sql pglogical--1.1.0--1.1.1.sql ++ pglogical--1.0.1--1.1.0.sql pglogical--1.1.0--1.1.1.sql \ ++ pglogical--1.1.2.sql pglogical--1.1.0--1.1.2.sql \ ++ pglogical--1.1.1--1.1.2.sql + + OBJS = pglogical_apply.o pglogical_conflict.o pglogical_manager.o \ + pglogical_node.o pglogical_proto.o pglogical_relcache.o \ Modified: head/databases/pglogical/pkg-plist ============================================================================== --- head/databases/pglogical/pkg-plist Fri Aug 19 09:41:28 2016 (r420453) +++ head/databases/pglogical/pkg-plist Fri Aug 19 10:11:37 2016 (r420454) @@ -1,4 +1,5 @@ bin/pglogical_create_subscriber +%%PGSQL94%%bin/pglogical_dump lib/postgresql/pglogical.so share/postgresql/extension/pglogical--1.0.0--1.0.1.sql share/postgresql/extension/pglogical--1.0.0--1.1.0.sql @@ -6,6 +7,11 @@ share/postgresql/extension/pglogical--1. share/postgresql/extension/pglogical--1.0.1--1.1.0.sql share/postgresql/extension/pglogical--1.0.1.sql share/postgresql/extension/pglogical--1.1.0--1.1.1.sql +share/postgresql/extension/pglogical--1.1.0--1.1.2.sql share/postgresql/extension/pglogical--1.1.0.sql +share/postgresql/extension/pglogical--1.1.1--1.1.2.sql share/postgresql/extension/pglogical--1.1.1.sql +share/postgresql/extension/pglogical--1.1.2.sql share/postgresql/extension/pglogical.control +%%PGSQL94%%share/postgresql/extension/pglogical_origin--1.0.0.sql +%%PGSQL94%%share/postgresql/extension/pglogical_origin.control