Index: head/databases/postgresql-plproxy/files/patch-src-cluster.c =================================================================== --- head/databases/postgresql-plproxy/files/patch-src-cluster.c (revision 512811) +++ head/databases/postgresql-plproxy/files/patch-src-cluster.c (nonexistent) @@ -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); Property changes on: head/databases/postgresql-plproxy/files/patch-src-cluster.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/postgresql-plproxy/files/patch-src-parser.y =================================================================== --- head/databases/postgresql-plproxy/files/patch-src-parser.y (revision 512811) +++ head/databases/postgresql-plproxy/files/patch-src-parser.y (nonexistent) @@ -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 CONNECT CLUSTER RUN ON ALL ANY SELECT - %token IDENT NUMBER FNCALL SPLIT STRING Property changes on: head/databases/postgresql-plproxy/files/patch-src-parser.y ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/postgresql-plproxy/files/patch-src-execute.c =================================================================== --- head/databases/postgresql-plproxy/files/patch-src-execute.c (revision 512811) +++ head/databases/postgresql-plproxy/files/patch-src-execute.c (nonexistent) @@ -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 -+#include - - #include "poll_compat.h" - -@@ -35,15 +36,9 @@ - #include - #include - #endif --#ifdef HAVE_SYS_SOCKET_H - #include --#endif --#ifdef HAVE_NETINET_IN_H - #include --#endif --#ifdef HAVE_NETINET_TCP_H - #include --#endif - #ifdef HAVE_ARPA_INET_H - #include - #endif Property changes on: head/databases/postgresql-plproxy/files/patch-src-execute.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/postgresql-plproxy/files/patch-src-function.c =================================================================== --- head/databases/postgresql-plproxy/files/patch-src-function.c (revision 512811) +++ head/databases/postgresql-plproxy/files/patch-src-function.c (nonexistent) @@ -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; - } Property changes on: head/databases/postgresql-plproxy/files/patch-src-function.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/postgresql-plproxy/Makefile =================================================================== --- head/databases/postgresql-plproxy/Makefile (revision 512811) +++ head/databases/postgresql-plproxy/Makefile (revision 512812) @@ -1,26 +1,25 @@ # Created by: Sergey Skvortsov # $FreeBSD$ PORTNAME= plproxy DISTVERSIONPREFIX= plproxy_ -DISTVERSION= 2_8 -PORTREVISION= 2 +DISTVERSION= 2_9 CATEGORIES= databases PKGNAMEPREFIX= postgresql- MAINTAINER= sunpoet@FreeBSD.org COMMENT= PL/Proxy - Function-based sharding for PostgreSQL LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= bison gmake pgsql LLD_UNSAFE= yes USE_GITHUB= yes post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/plproxy.so .include Index: head/databases/postgresql-plproxy/distinfo =================================================================== --- head/databases/postgresql-plproxy/distinfo (revision 512811) +++ head/databases/postgresql-plproxy/distinfo (revision 512812) @@ -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 Index: head/databases/postgresql-plproxy/pkg-plist =================================================================== --- head/databases/postgresql-plproxy/pkg-plist (revision 512811) +++ head/databases/postgresql-plproxy/pkg-plist (revision 512812) @@ -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