pglogical: update to 1.2.0

pglogical-output: delete; merged into databases/pglogical

The databases/pglogical	  and databases/pglogical-output ports have been
merged into one codebase upstream, and database/pglogical now installs
the pglogical-output.so module.

pkg(8) should handle the merger	correctly; portmaster(1),
portupgrade(1) users are advised to manually delete pglogical-output
before upgrading.

13 files changed, 24 insertions, 104 deletions

diff --git a/MOVED b/MOVED
index 23ea08720b08..08e44b220200 100644
--- a/MOVED
+++ b/MOVED
@@ -8633,3 +8633,4 @@ security/letsencrypt.sh|security/dehydrated|2016-09-13|Upstream renamed the proj
 devel/py-dogpile.core|devel/py-dogpile.cache|2016-09-13|EOL upstream. Merged into devel/py-dogpile.cache since 0.6.0
 korean/imhangul||2016-09-15|Split into korean/imhangul-gtk2 and korean/imhangul-gtk3
 devel/poco-devel|devel/poco|2016-09-18|Has expired: older than stable devel/poco
+databases/pglogical-output|databases/pglogical|2016-09-22|databases/pglogical-output merged into databases/pglogical
diff --git a/UPDATING b/UPDATING
index 3bd9bde09c3e..bc8d00cdaad6 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,14 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20160922:
+  AFFECTS: users of databases/pglogical, databases/pglogical-output
+  AUTHOR:  matthew@FreeBSD.org
+
+  As of version 1.2.0, databases/pglogical-output has been merged into
+  databases/pglogical.  portmaster or portupgrade users should delete
+  pglogical-output manually before upgrading.
+
 20160921:
   AFFECTS: users of mail/sieve-connect
   AUTHOR: alexey@renatasystems.org
diff --git a/databases/Makefile b/databases/Makefile
index cd75452ce0fd..dd59447ce45e 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -573,7 +573,6 @@
     SUBDIR += pglesslog
     SUBDIR += pgloader
     SUBDIR += pglogical
-    SUBDIR += pglogical-output
     SUBDIR += pgmodeler
     SUBDIR += pgpool
     SUBDIR += pgpool-II
diff --git a/databases/pglogical-output/Makefile b/databases/pglogical-output/Makefile
deleted file mode 100644
index 89a07a657506..000000000000
--- a/databases/pglogical-output/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: MAtthew Seaman
-# $FreeBSD$
-
-PORTNAME=	pglogical-output
-PORTVERSION=	1.1.0
-CATEGORIES=	databases
-MASTER_SITES=	http://packages.2ndquadrant.com/pglogical/tarballs/
-
-MAINTAINER=	matthew@FreeBSD.org
-COMMENT=	Logical replication system as a PostgreSQL extension
-
-LICENSE=	PostgreSQL
-
-USES=		gmake pgsql:9.4+ tar:bzip2
-WANT_PGSQL=	server
-
-MAKE_ARGS=	USE_PGXS=1
-
-OPTIONS_DEFINE=	DOCS
-
-DOCS_PORTDOCS=	*
-
-# FFI
-#TEST_DEPENDS=	pg_regress:databases/postgresql${PGSQL_VER_NODOT}-pg_regress
-#TEST_TARGET=	do-test
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pglogical_output.so
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README		${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/protocol.txt	${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/DESIGN.md		${STAGEDIR}${DOCSDIR}
-
-#do-test:
-#	${MAKE} ${MAKE_ARGS} installcheck
-
-.include <bsd.port.mk>
diff --git a/databases/pglogical-output/distinfo b/databases/pglogical-output/distinfo
deleted file mode 100644
index abcc7c6b86db..000000000000
--- a/databases/pglogical-output/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1465329953
-SHA256 (pglogical-output-1.1.0.tar.bz2) = d04c6650855a7a60e62d05a6c25d1f928ab1663ea219c95fc2776a398dc69bdd
-SIZE (pglogical-output-1.1.0.tar.bz2) = 105985
diff --git a/databases/pglogical-output/files/patch-Makefile b/databases/pglogical-output/files/patch-Makefile
deleted file mode 100644
index 2732b3d0c3fd..000000000000
--- a/databases/pglogical-output/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2016-06-08 15:56:57 UTC
-+++ Makefile
-@@ -30,7 +30,7 @@ EXTRA_INSTALL += ./examples/hooks
- REGRESS_OPTS += --temp-config=regression.conf
- 
- plhooks:
--	make -C examples/hooks USE_PGXS=1 clean install
-+	${MAKE} -C examples/hooks USE_PGXS=1 clean install
- 
- installcheck: plhooks
- 
diff --git a/databases/pglogical-output/pkg-descr b/databases/pglogical-output/pkg-descr
deleted file mode 100644
index 6d627e92af11..000000000000
--- a/databases/pglogical-output/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-pglogical is a logical replication system implemented entirely as a
-PostgreSQL extension. Fully integrated, it requires no triggers or
-external programs. This alternative to physical replication is a
-highly efficient method of replicating data using a publish/subscribe
-model for selective replication.
-
-WWW: http://2ndquadrant.com/en/resources/pglogical/
diff --git a/databases/pglogical-output/pkg-message b/databases/pglogical-output/pkg-message
deleted file mode 100644
index b26ce6c3dbcd..000000000000
--- a/databases/pglogical-output/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-
-The pglogical-output extension is pointless without the pglogical
-extension, and vice versa.  Please install both pglogical and
-pglogical-output extensions (that match the local postgresql server
-version) on both the sending and receiving instances of postgresql
-server.
diff --git a/databases/pglogical-output/pkg-plist b/databases/pglogical-output/pkg-plist
deleted file mode 100644
index 7871d389cac1..000000000000
--- a/databases/pglogical-output/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-include/pglogical_output/compat.h
-include/pglogical_output/hooks.h
-lib/postgresql/pglogical_output.so
-share/postgresql/extension/pglogical_output--1.0.0--1.1.0.sql
-share/postgresql/extension/pglogical_output--1.0.1--1.1.0.sql
-share/postgresql/extension/pglogical_output--1.1.0.sql
-share/postgresql/extension/pglogical_output.control
diff --git a/databases/pglogical/Makefile b/databases/pglogical/Makefile
index 447a95078d21..3877205d00eb 100644
--- a/databases/pglogical/Makefile
+++ b/databases/pglogical/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pglogical
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	databases
 MASTER_SITES=	http://packages.2ndquadrant.com/pglogical/tarballs/
 
@@ -12,9 +11,6 @@ COMMENT=	Logical replication system as a PostgreSQL extension
 
 LICENSE=	PostgreSQL
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/postgresql/pglogical_output.so:databases/pglogical-output
-RUN_DEPENDS=	${LOCALBASE}/lib/postgresql/pglogical_output.so:databases/pglogical-output
-
 USES=		gmake pgsql:9.4+ tar:bzip2
 WANT_PGSQL=	client server
 
@@ -39,6 +35,7 @@ PLIST_SUB=	PGSQL94="@comment "
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pglogical_create_subscriber
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pglogical.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pglogical_output.so
 .if ${PGSQL_VER:M9.4}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pglogical_dump
 .endif
diff --git a/databases/pglogical/distinfo b/databases/pglogical/distinfo
index b5e23758d2f5..e8b5026c227f 100644
--- a/databases/pglogical/distinfo
+++ b/databases/pglogical/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465561102
-SHA256 (pglogical-1.1.2.tar.bz2) = 9fca04947c23ab31f96b3fa2bb60f4e9498df24952e54e7f05be5ed6e1090440
-SIZE (pglogical-1.1.2.tar.bz2) = 257139
+TIMESTAMP = 1474554898
+SHA256 (pglogical-1.2.0.tar.bz2) = d289a1307ebd66a60a9547cee920101c85df354809a507eb218bf2aa93c16afe
+SIZE (pglogical-1.2.0.tar.bz2) = 319475
diff --git a/databases/pglogical/files/patch-Makefile b/databases/pglogical/files/patch-Makefile
deleted file mode 100644
index f2f83d8b742f..000000000000
--- a/databases/pglogical/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 \
diff --git a/databases/pglogical/pkg-plist b/databases/pglogical/pkg-plist
index 6d6138fcbf4b..49e68bc60b3f 100644
--- a/databases/pglogical/pkg-plist
+++ b/databases/pglogical/pkg-plist
@@ -1,17 +1,18 @@
-bin/pglogical_create_subscriber
 %%PGSQL94%%bin/pglogical_dump
+bin/pglogical_create_subscriber
+include/pglogical_output/compat.h
+include/pglogical_output/hooks.h
 lib/postgresql/pglogical.so
+lib/postgresql/pglogical_output.so
 share/postgresql/extension/pglogical--1.0.0--1.0.1.sql
-share/postgresql/extension/pglogical--1.0.0--1.1.0.sql
 share/postgresql/extension/pglogical--1.0.0.sql
 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--1.1.2--1.2.0.sql
+share/postgresql/extension/pglogical--1.2.0.sql
 share/postgresql/extension/pglogical.control
-%%PGSQL94%%share/postgresql/extension/pglogical_origin--1.0.0.sql
-%%PGSQL94%%share/postgresql/extension/pglogical_origin.control
+share/postgresql/extension/pglogical_origin--1.0.0.sql
+share/postgresql/extension/pglogical_origin.control
+share/postgresql/extension/pglogical_output--1.1.0.sql
+share/postgresql/extension/pglogical_output.control