Index: head/databases/postgresql-plproxy/files/patch-src-cluster.c =================================================================== --- head/databases/postgresql-plproxy/files/patch-src-cluster.c (nonexistent) +++ head/databases/postgresql-plproxy/files/patch-src-cluster.c (revision 509088) @@ -0,0 +1,26 @@ +--- 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +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 (nonexistent) +++ head/databases/postgresql-plproxy/files/patch-src-execute.c (revision 509088) @@ -0,0 +1,29 @@ +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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +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 (nonexistent) +++ head/databases/postgresql-plproxy/files/patch-src-function.c (revision 509088) @@ -0,0 +1,16 @@ +--- 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property