Update to 2.9

Changes:	https://github.com/plproxy/plproxy/blob/master/NEWS.md
		https://plproxy.github.io/changelog.html

7 files changed, 12 insertions, 94 deletions

diff --git a/databases/postgresql-plproxy/Makefile b/databases/postgresql-plproxy/Makefile
index 681f105597ee..93f789b54e70 100644
--- a/databases/postgresql-plproxy/Makefile
+++ b/databases/postgresql-plproxy/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	plproxy
 DISTVERSIONPREFIX=	plproxy_
-DISTVERSION=	2_8
-PORTREVISION=	2
+DISTVERSION=	2_9
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql-
 
diff --git a/databases/postgresql-plproxy/distinfo b/databases/postgresql-plproxy/distinfo
index c72d66333fbc..50dfb1eadee3 100644
--- a/databases/postgresql-plproxy/distinfo
+++ b/databases/postgresql-plproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519301795
-SHA256 (plproxy-plproxy-plproxy_2_8_GH0.tar.gz) = cad170b0686f6f22b9df21da6e89396d430f30c15e9cf43837321cd4a2834bf1
-SIZE (plproxy-plproxy-plproxy_2_8_GH0.tar.gz) = 80364
+TIMESTAMP = 1568802080
+SHA256 (plproxy-plproxy-plproxy_2_9_GH0.tar.gz) = bf36725be43d5bcec212c98f4900e64cce491df506abeb21010e4df89454c92b
+SIZE (plproxy-plproxy-plproxy_2_9_GH0.tar.gz) = 76099
diff --git a/databases/postgresql-plproxy/files/patch-src-cluster.c b/databases/postgresql-plproxy/files/patch-src-cluster.c
deleted file mode 100644
index 744f38cbfde6..000000000000
--- a/databases/postgresql-plproxy/files/patch-src-cluster.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/cluster.c.orig	2017-10-08 08:53:35 UTC
-+++ src/cluster.c
-@@ -588,7 +588,11 @@ reload_sqlmed_user(ProxyFunction *func, 
- 	 */
- 	aclresult = pg_foreign_server_aclcheck(um->serverid, um->userid, ACL_USAGE);
- 	if (aclresult != ACLCHECK_OK)
-+#if PG_VERSION_NUM >= 110000
-+		aclcheck_error(aclresult, OBJECT_FOREIGN_SERVER, cluster->name);
-+#else
- 		aclcheck_error(aclresult, ACL_KIND_FOREIGN_SERVER, cluster->name);
-+#endif
- 
- 	/* Extract the common connect string elements from user mapping */
- 	got_user = false;
-@@ -657,7 +661,11 @@ reload_sqlmed_cluster(ProxyFunction *fun
- 	 */
- 	aclresult = pg_foreign_server_aclcheck(foreign_server->serverid, info->user_oid, ACL_USAGE);
- 	if (aclresult != ACLCHECK_OK)
-+#if PG_VERSION_NUM >= 110000
-+		aclcheck_error(aclresult, OBJECT_FOREIGN_SERVER, foreign_server->servername);
-+#else
- 		aclcheck_error(aclresult, ACL_KIND_FOREIGN_SERVER, foreign_server->servername);
-+#endif
- 
- 	/* drop old config values */
- 	clear_config(&cluster->config);
diff --git a/databases/postgresql-plproxy/files/patch-src-execute.c b/databases/postgresql-plproxy/files/patch-src-execute.c
deleted file mode 100644
index 61a68b920bec..000000000000
--- a/databases/postgresql-plproxy/files/patch-src-execute.c
+++ /dev/null
@@ -1,29 +0,0 @@
-HAVE_NETINET_IN_H and HAVE_SYS_SOCKET_H were removed from pg_config.h in PostgreSQL 10
-HAVE_NETINET_TCP_H was removed from pg_config.h in PostgreSQL 11
-
---- src/execute.c.orig	2017-10-08 08:53:35 UTC
-+++ src/execute.c
-@@ -28,6 +28,7 @@
- #include "plproxy.h"
- 
- #include <sys/time.h>
-+#include <sys/types.h>
- 
- #include "poll_compat.h"
- 
-@@ -35,15 +36,9 @@
- #include <winsock2.h>
- #include <ws2tcpip.h>
- #endif
--#ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
--#endif
--#ifdef HAVE_NETINET_IN_H
- #include <netinet/in.h>
--#endif
--#ifdef HAVE_NETINET_TCP_H
- #include <netinet/tcp.h>
--#endif
- #ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
- #endif
diff --git a/databases/postgresql-plproxy/files/patch-src-function.c b/databases/postgresql-plproxy/files/patch-src-function.c
deleted file mode 100644
index 0ee9cd9622a3..000000000000
--- a/databases/postgresql-plproxy/files/patch-src-function.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/function.c.orig	2017-10-08 08:53:35 UTC
-+++ src/function.c
-@@ -214,8 +214,13 @@ fn_returns_dynamic_record(HeapTuple proc
- 	Form_pg_proc proc_struct;
- 	proc_struct = (Form_pg_proc) GETSTRUCT(proc_tuple);
- 	if (proc_struct->prorettype == RECORDOID
-+#if PG_VERSION_NUM >= 110000
-+		&& (heap_attisnull(proc_tuple, Anum_pg_proc_proargmodes, NULL)
-+		    || heap_attisnull(proc_tuple, Anum_pg_proc_proargnames, NULL)))
-+#else
- 		&& (heap_attisnull(proc_tuple, Anum_pg_proc_proargmodes)
- 		    || heap_attisnull(proc_tuple, Anum_pg_proc_proargnames)))
-+#endif
- 		return true;
- 	return false;
- }
diff --git a/databases/postgresql-plproxy/files/patch-src-parser.y b/databases/postgresql-plproxy/files/patch-src-parser.y
deleted file mode 100644
index 239e8d253611..000000000000
--- a/databases/postgresql-plproxy/files/patch-src-parser.y
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/parser.y.orig	2017-10-08 08:53:35 UTC
-+++ src/parser.y
-@@ -60,7 +60,7 @@ static void reset_parser_vars(void)
-  * same range of Bison versions that are supported also
-  * by PostgreSQL.
-  */
--%name-prefix="plproxy_yy"
-+%define api.prefix {plproxy_yy}
- 
- %token <str> CONNECT CLUSTER RUN ON ALL ANY SELECT
- %token <str> IDENT NUMBER FNCALL SPLIT STRING
diff --git a/databases/postgresql-plproxy/pkg-plist b/databases/postgresql-plproxy/pkg-plist
index 4c9ce8bc1a38..4cd3a73e7ffd 100644
--- a/databases/postgresql-plproxy/pkg-plist
+++ b/databases/postgresql-plproxy/pkg-plist
@@ -1,9 +1,10 @@
 lib/postgresql/plproxy.so
-share/postgresql/extension/plproxy--2.3.0--2.8.0.sql
-share/postgresql/extension/plproxy--2.4.0--2.8.0.sql
-share/postgresql/extension/plproxy--2.5.0--2.8.0.sql
-share/postgresql/extension/plproxy--2.6.0--2.8.0.sql
-share/postgresql/extension/plproxy--2.7.0--2.8.0.sql
-share/postgresql/extension/plproxy--2.8.0.sql
-share/postgresql/extension/plproxy--unpackaged--2.8.0.sql
+share/postgresql/extension/plproxy--2.3.0--2.9.0.sql
+share/postgresql/extension/plproxy--2.4.0--2.9.0.sql
+share/postgresql/extension/plproxy--2.5.0--2.9.0.sql
+share/postgresql/extension/plproxy--2.6.0--2.9.0.sql
+share/postgresql/extension/plproxy--2.7.0--2.9.0.sql
+share/postgresql/extension/plproxy--2.8.0--2.9.0.sql
+share/postgresql/extension/plproxy--2.9.0.sql
+share/postgresql/extension/plproxy--unpackaged--2.9.0.sql
 share/postgresql/extension/plproxy.control