Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Aug 2019 15:33:03 +0000 (UTC)
From:      Palle Girgensohn <girgen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r508390 - in head: Mk/Uses databases/postgresql10-client databases/postgresql10-contrib databases/postgresql10-docs databases/postgresql10-pgtcl databases/postgresql10-plperl databases/...
Message-ID:  <201908081533.x78FX3J8008298@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: girgen
Date: Thu Aug  8 15:33:02 2019
New Revision: 508390
URL: https://svnweb.freebsd.org/changeset/ports/508390

Log:
  iThe PostgreSQL Global Development Group has released an update to all
  supported versions of our database system, including 11.5, 10.10,
  9.6.15, 9.5.19, and 9.4.24, as well as the third beta of PostgreSQL 12.
  This release fixes two security issues in the PostgreSQL server, two
  security issues found in one of the PostgreSQL Windows installers, and
  over 40 bugs reported since the previous release.
  
  Users should install these updates as soon as possible.
  
  A Note on the PostgreSQL 12 Beta
  ================================
  
  In the spirit of the open source PostgreSQL community, we strongly
  encourage you to test the new features of PostgreSQL 12 in your database
  systems to help us eliminate any bugs or other issues that may exist.
  While we do not advise you to run PostgreSQL 12 Beta 3 in your
  production environments, we encourage you to find ways to run your
  typical application workloads against this beta release.
  
  Your testing and feedback will help the community ensure that the
  PostgreSQL 12 release upholds our standards of providing a stable,
  reliable release of the world's most advanced open source relational
  database.
  
  Security Issues
  ===============
  
  Two security vulnerabilities have been closed by this release:
  
  * CVE-2019-10208: `TYPE` in `pg_temp` executes arbitrary SQL during
  `SECURITY DEFINER` execution
  
  Versions Affected: 9.4 - 11
  
  Given a suitable `SECURITY DEFINER` function, an attacker can execute
  arbitrary SQL under the identity of the function owner.  An attack
  requires `EXECUTE` permission on the function, which must itself contain
  a function call having inexact argument type match.  For example,
  `length('foo'::varchar)` and `length('foo')` are inexact, while
  `length('foo'::text)` is exact.  As part of exploiting this
  vulnerability, the attacker uses `CREATE DOMAIN` to create a type in a
  `pg_temp` schema. The attack pattern and fix are similar to that for
  CVE-2007-2138.
  
  Writing `SECURITY DEFINER` functions continues to require following the
  considerations noted in the documentation:
  
  https://www.postgresql.org/docs/devel/sql-createfunction.html#SQL-CREATEFUNCTION-SECURITY
  
  The PostgreSQL project thanks Tom Lane for reporting this problem.
  
  * CVE-2019-10209: Memory disclosure in cross-type comparison for hashed
  subplan
  
  Versions Affected: 11
  
  In a database containing hypothetical, user-defined hash equality operators, an attacker could read arbitrary bytes of server memory. For an attack to become possible, a superuser would need to create unusual operators. It is possible for operators not purpose-crafted for attack to have the properties that enable an attack, but we are not aware of specific examples.
  
  The PostgreSQL project thanks Andreas Seltenreich for reporting this problem.

Added:
  head/databases/postgresql12-client/
     - copied from r508310, head/databases/postgresql11-client/
  head/databases/postgresql12-contrib/
     - copied from r508310, head/databases/postgresql11-contrib/
  head/databases/postgresql12-docs/
     - copied from r508310, head/databases/postgresql96-docs/
  head/databases/postgresql12-pgtcl/
     - copied from r508310, head/databases/postgresql11-pgtcl/
  head/databases/postgresql12-plperl/
     - copied from r508310, head/databases/postgresql95-plperl/
  head/databases/postgresql12-plpython/
     - copied from r508310, head/databases/postgresql95-plpython/
  head/databases/postgresql12-pltcl/
     - copied from r508310, head/databases/postgresql96-pltcl/
  head/databases/postgresql12-server/
     - copied from r505566, head/databases/postgresql11-server/
Modified:
  head/Mk/Uses/pgsql.mk
  head/databases/postgresql10-client/Makefile
  head/databases/postgresql10-contrib/Makefile
  head/databases/postgresql10-docs/Makefile
  head/databases/postgresql10-pgtcl/Makefile
  head/databases/postgresql10-plperl/Makefile
  head/databases/postgresql10-plpython/Makefile
  head/databases/postgresql10-pltcl/Makefile
  head/databases/postgresql10-server/Makefile
  head/databases/postgresql10-server/distinfo
  head/databases/postgresql11-client/Makefile
  head/databases/postgresql11-contrib/Makefile
  head/databases/postgresql11-docs/Makefile
  head/databases/postgresql11-pgtcl/Makefile
  head/databases/postgresql11-plperl/Makefile
  head/databases/postgresql11-plpython/Makefile
  head/databases/postgresql11-pltcl/Makefile
  head/databases/postgresql11-server/Makefile
  head/databases/postgresql11-server/distinfo
  head/databases/postgresql12-client/Makefile
  head/databases/postgresql12-contrib/Makefile
  head/databases/postgresql12-docs/Makefile
  head/databases/postgresql12-pgtcl/Makefile
  head/databases/postgresql12-plperl/Makefile
  head/databases/postgresql12-plpython/Makefile
  head/databases/postgresql12-pltcl/Makefile
  head/databases/postgresql12-server/Makefile
  head/databases/postgresql12-server/distinfo
  head/databases/postgresql12-server/pkg-plist-client
  head/databases/postgresql12-server/pkg-plist-contrib
  head/databases/postgresql12-server/pkg-plist-server
  head/databases/postgresql94-client/Makefile
  head/databases/postgresql94-contrib/Makefile
  head/databases/postgresql94-docs/Makefile
  head/databases/postgresql94-pgtcl/Makefile
  head/databases/postgresql94-plperl/Makefile
  head/databases/postgresql94-plpython/Makefile
  head/databases/postgresql94-pltcl/Makefile
  head/databases/postgresql94-server/Makefile
  head/databases/postgresql94-server/distinfo
  head/databases/postgresql95-client/Makefile
  head/databases/postgresql95-contrib/Makefile
  head/databases/postgresql95-docs/Makefile
  head/databases/postgresql95-pgtcl/Makefile
  head/databases/postgresql95-plperl/Makefile
  head/databases/postgresql95-plpython/Makefile
  head/databases/postgresql95-pltcl/Makefile
  head/databases/postgresql95-server/Makefile
  head/databases/postgresql95-server/distinfo
  head/databases/postgresql96-client/Makefile
  head/databases/postgresql96-contrib/Makefile
  head/databases/postgresql96-docs/Makefile
  head/databases/postgresql96-pgtcl/Makefile
  head/databases/postgresql96-plperl/Makefile
  head/databases/postgresql96-plpython/Makefile
  head/databases/postgresql96-pltcl/Makefile
  head/databases/postgresql96-server/Makefile
  head/databases/postgresql96-server/distinfo

Modified: head/Mk/Uses/pgsql.mk
==============================================================================
--- head/Mk/Uses/pgsql.mk	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/Mk/Uses/pgsql.mk	Thu Aug  8 15:33:02 2019	(r508390)
@@ -41,7 +41,7 @@ _INCLUDE_USES_PGSQL_MK=	yes
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-VALID_PGSQL_VER=	9.4 9.5 9.6 10 11
+VALID_PGSQL_VER=	9.4 9.5 9.6 10 11 12
 
 # Override non-default LIBVERS like this:
 #PGSQL99_LIBVER=6

Modified: head/databases/postgresql10-client/Makefile
==============================================================================
--- head/databases/postgresql10-client/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql10-client/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	PostgreSQL database (client)
 

Modified: head/databases/postgresql10-contrib/Makefile
==============================================================================
--- head/databases/postgresql10-contrib/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql10-contrib/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org

Modified: head/databases/postgresql10-docs/Makefile
==============================================================================
--- head/databases/postgresql10-docs/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql10-docs/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=10
 
-.include "${.CURDIR}/../postgresql96-docs/Makefile"
+.include "${.CURDIR}/../postgresql12-docs/Makefile"

Modified: head/databases/postgresql10-pgtcl/Makefile
==============================================================================
--- head/databases/postgresql10-pgtcl/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql10-pgtcl/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-postgresql10
 
 CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]*

Modified: head/databases/postgresql10-plperl/Makefile
==============================================================================
--- head/databases/postgresql10-plperl/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql10-plperl/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	10
 
-.include "${.CURDIR}/../postgresql95-plperl/Makefile"
+.include "${.CURDIR}/../postgresql12-plperl/Makefile"

Modified: head/databases/postgresql10-plpython/Makefile
==============================================================================
--- head/databases/postgresql10-plpython/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql10-plpython/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -2,4 +2,4 @@
 
 WANT_PGSQL_VER=	10
 
-.include "${.CURDIR}/../postgresql95-plpython/Makefile"
+.include "${.CURDIR}/../postgresql12-plpython/Makefile"

Modified: head/databases/postgresql10-pltcl/Makefile
==============================================================================
--- head/databases/postgresql10-pltcl/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql10-pltcl/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	10
 
-.include "${.CURDIR}/../postgresql96-pltcl/Makefile"
+.include "${.CURDIR}/../postgresql12-pltcl/Makefile"

Modified: head/databases/postgresql10-server/Makefile
==============================================================================
--- head/databases/postgresql10-server/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql10-server/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -1,10 +1,10 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	10.9
+DISTVERSION?=	10.10
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	1
+PORTREVISION?=	0
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
@@ -24,4 +24,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.include "${.CURDIR}/../postgresql11-server/Makefile"
+.include "${.CURDIR}/../postgresql12-server/Makefile"

Modified: head/databases/postgresql10-server/distinfo
==============================================================================
--- head/databases/postgresql10-server/distinfo	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql10-server/distinfo	Thu Aug  8 15:33:02 2019	(r508390)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561409430
-SHA256 (postgresql/postgresql-10.9.tar.bz2) = 958b317fb007e94f3bef7e2a6641875db8f7f9d73db9f283324f3d6e8f5b0f54
-SIZE (postgresql/postgresql-10.9.tar.bz2) = 18981395
+TIMESTAMP = 1565174246
+SHA256 (postgresql/postgresql-10.10.tar.bz2) = ad4f9b8575f98ed6091bf9bb2cb16f0e52795a5f66546c1f499ca5c69b21f253
+SIZE (postgresql/postgresql-10.10.tar.bz2) = 19012049

Modified: head/databases/postgresql11-client/Makefile
==============================================================================
--- head/databases/postgresql11-client/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql11-client/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	PostgreSQL database (client)
 

Modified: head/databases/postgresql11-contrib/Makefile
==============================================================================
--- head/databases/postgresql11-contrib/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql11-contrib/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org

Modified: head/databases/postgresql11-docs/Makefile
==============================================================================
--- head/databases/postgresql11-docs/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql11-docs/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=11
 
-.include "${.CURDIR}/../postgresql96-docs/Makefile"
+.include "${.CURDIR}/../postgresql12-docs/Makefile"

Modified: head/databases/postgresql11-pgtcl/Makefile
==============================================================================
--- head/databases/postgresql11-pgtcl/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql11-pgtcl/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-postgresql11
 
 CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql10-*

Modified: head/databases/postgresql11-plperl/Makefile
==============================================================================
--- head/databases/postgresql11-plperl/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql11-plperl/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	11
 
-.include "${.CURDIR}/../postgresql95-plperl/Makefile"
+.include "${.CURDIR}/../postgresql12-plperl/Makefile"

Modified: head/databases/postgresql11-plpython/Makefile
==============================================================================
--- head/databases/postgresql11-plpython/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql11-plpython/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -2,4 +2,4 @@
 
 WANT_PGSQL_VER=	11
 
-.include "${.CURDIR}/../postgresql95-plpython/Makefile"
+.include "${.CURDIR}/../postgresql12-plpython/Makefile"

Modified: head/databases/postgresql11-pltcl/Makefile
==============================================================================
--- head/databases/postgresql11-pltcl/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql11-pltcl/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	11
 
-.include "${.CURDIR}/../postgresql96-pltcl/Makefile"
+.include "${.CURDIR}/../postgresql12-pltcl/Makefile"

Modified: head/databases/postgresql11-server/Makefile
==============================================================================
--- head/databases/postgresql11-server/Makefile	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql11-server/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -1,55 +1,14 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME?=	postgresql
-DISTVERSION?=	11.4
+DISTVERSION?=	11.5
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	1
-CATEGORIES?=	databases
-MASTER_SITES=	PGSQL/source/v${DISTVERSION}
-PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
+PORTREVISION?=	0
+PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
-COMMENT?=	PostgreSQL is the most advanced open-source database available anywhere
 
-LICENSE=	PostgreSQL
-
-.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 10
-CONFLICTS+=	${PORTNAME}9* ${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]*
-.else
-CONFLICTS+=	${PORTNAME}9[^${PORTVERSION:R:E}]* ${PORTNAME}1[0-9]*
-.endif
-
-WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
-DIST_SUBDIR=	postgresql
-
-OPTIONS_SUB=	yes
-
-PKGINSTALL?=	${PKGDIR}/pkg-install${COMPONENT}
-USES+=		tar:bzip2 cpe
-.if !defined(NO_BUILD)
-USES+=		gmake
-GNU_CONFIGURE=	yes
-.endif
-
-PG_USER?=	postgres
-PG_GROUP?=	postgres
-PG_UID?=	770
-
-LDFLAGS+=	-L${LOCALBASE}/lib
-INCLUDES+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
-		--with-includes=${PREFIX}/include \
-		--enable-thread-safety
-CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
-		PTHREAD_LIBS="-lpthread" \
-		LDFLAGS_SL="${LDFLAGS_SL}"
-LDFLAGS+=	-lpthread
-MAKE_ENV=	MAKELEVEL=0
-
-PLIST=		${PKGDIR}/pkg-plist${COMPONENT}
-
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
@@ -61,247 +20,8 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade
 
-BUILD_DIRS?=	src/port ${INSTALL_DIRS}
-INSTALL_TARGET?=install-strip
+PG_USER?=	postgres
+PG_GROUP?=	postgres
+PG_UID?=	770
 
-.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
-SERVER_ONLY=	yes
-COMPONENT=	-server
-USE_RC_SUBR=	postgresql
-USES+=		pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
-USERS=		${PG_USER}
-GROUPS=	${PG_GROUP}
-SUB_FILES+=	502.pgsql
-.endif
-
-.if defined(CLIENT_ONLY)
-OPTIONS_DEFINE+=LIBEDIT DOCS
-LIBEDIT_DESC=	Use non-GPL libedit instead of readline
-USES+=		perl5
-.else
-MAKE_ENV+=	PATH=${PREFIX}/bin:${PATH}
-CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
-.endif
-
-.if defined(SERVER_ONLY)
-OPTIONS_DEFINE=	DTRACE LDAP INTDATE TZDATA XML DOCS
-LDAP_DESC=	Build with LDAP authentication support
-DTRACE_DESC=	Build with DTrace probes
-TZDATA_DESC=	Use internal timezone database
-XML_DESC=	Build with XML data type
-
-.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11
-OPTIONS_DEFINE+=LLVM
-LLVM_DESC=	Build with support for JIT-compiling expressions
-.endif
-
-.if ${DISTVERSION:C/([0-9]*).*/\1/} < 10
-# See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
-OPTIONS_DEFINE+=	ICU
-ICU_DESC=	Use ICU for unicode collation
-.else
-CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS+=	libicudata.so:devel/icu
-USES+=		pkgconfig
-.endif
-
-# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
-# (requires dump/restore if modified.)
-OPTIONS_DEFINE+=	INTDATE
-INTDATE_DESC=		Builds with 64-bit date/time type
-OPTIONS_DEFAULT+=	TZDATA INTDATE
-.endif
-
-.if !defined(SLAVE_ONLY)
-OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS
-. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3
-  OPTIONS_RADIO=	KRB5
-  OPTIONS_RADIO_KRB5=	MIT_KRB5 HEIMDAL_KRB5
-. endif
-
-KRB5_DESC=		Build with kerberos provider support
-NLS_DESC=		Use internationalized messages
-PAM_DESC=		Build with PAM Support
-MIT_KRB5_DESC=		Build with MIT kerberos support
-HEIMDAL_KRB5_DESC=	Builds with Heimdal kerberos
-GSSAPI_DESC=		Build with GSSAPI support
-OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
-
-OPTIONS_DEFINE+=	SSL
-SSL_DESC=		Build with OpenSSL support
-
-OPTIONS_DEFAULT+=	SSL
-.endif # !SLAVE_ONLY
-
-.if defined(CLIENT_ONLY)
-LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred
-LIBEDIT_USES=		libedit
-LIBEDIT_USES_OFF=	readline
-.endif # CLIENT_ONLY
-
-SSL_USES=		ssl
-SSL_CONFIGURE_WITH=	openssl
-
-PAM_CONFIGURE_WITH=	pam
-
-XML_CONFIGURE_WITH=	libxml
-XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
-TZDATA_CONFIGURE_OFF=	--with-system-tzdata=/usr/share/zoneinfo
-
-INTDATE_CONFIGURE_OFF=	--disable-integer-datetimes
-
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext
-
-LDAP_CONFIGURE_WITH=	ldap
-LDAP_USE=		OPENLDAP=yes
-
-OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops
-
-DEBUG_CONFIGURE_ENABLE=	debug
-
-PLIST_SUB+=		PG_USER=${PG_USER} \
-			PG_GROUP=${PG_GROUP}
-SUB_LIST+=		PG_GROUP=${PG_GROUP} \
-			PG_USER=${PG_USER} \
-			PG_UID=${PG_UID}
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == "i386"
-USES+=		compiler:gcc-c++11-lib
-.endif
-
-.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11
-.  if defined(SERVER_ONLY) && ${PORT_OPTIONS:MLLVM}
-BUILD_DEPENDS+=		llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
-BUILD_DEPENDS+=		llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-RUN_DEPENDS+=		llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CONFIGURE_ENV+=		LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}
-CONFIGURE_ARGS+=	--with-llvm
-PLIST_SUB+=		LLVM=""
-INSTALL_DIRS+=		src/backend/jit/llvm
-.  else
-PLIST_SUB+=		LLVM="@comment "
-CONFIGURE_ARGS+=	--without-llvm
-.  endif
-.endif
-
-.if ${DISTVERSION:C/([0-9]*).*/\1/} < 10
-.  if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum)
-USES+=		autoreconf
-CONFIGURE_ARGS+=--with-icu
-PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	${ICU_PATCHFILE}:icu
-LIB_DEPENDS+=	libicudata.so:devel/icu
-.  endif
-.endif # server && version < 10
-
-.if !defined(SLAVE_ONLY)
-
-PATCH_DIST_STRIP=-p1
-
-.  if ${PORT_OPTIONS:MDTRACE}
-CONFIGURE_ARGS+=--enable-dtrace
-LDFLAGS+=-lelf
-INSTALL_TARGET=	install
-.  endif
-
-.if ${PORT_OPTIONS:MGSSAPI}
-CONFIGURE_ARGS+=--with-gssapi
-.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5)
-# Kerberos libraries will pull the proper GSSAPI library
-# via linker dependencies, but otherwise we must specify
-# it explicitely: ld --as-needed is used for compilation,
-# so configure's -lgssapi_krb5 won't go.
-LDFLAGS+=	-lgssapi
-LDFLAGS_SL+=	-lgssapi
-.endif
-.else
-CONFIGURE_ARGS+=--without-gssapi
-.endif
-
-.  if ${PORT_OPTIONS:MMIT_KRB5}
-.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
-IGNORE=	requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB
-.   else
-CONFIGURE_ARGS+=--with-krb5
-# Allow defining a home built MIT Kerberos by setting KRB5_HOME
-.    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
-LIB_DEPENDS+=	libkrb5.so.3:security/krb5
-.    endif
-.   endif
-.  endif
-
-.  if ${PORT_OPTIONS:MHEIMDAL_KRB5}
-CONFIGURE_ARGS+=--with-krb5
-.  endif
-
-.endif # !SLAVE_ONLY
-
-# For testing files in FILESDIR
-.include <bsd.port.pre.mk>
-
-.if defined(SERVER_ONLY)
-pre-build:
-	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-.endif
-
-.if !defined(NO_BUILD) && !target(do-build)
-
-do-build:
-	@ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
-	@ for dir in ${BUILD_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \
-	done
-
-.  if exists(${FILESDIR}/pkg-message${COMPONENT}.in)
-SUB_FILES+=	pkg-message${COMPONENT}
-PKGMESSAGE=	${WRKSRC}/pkg-message${COMPONENT}
-.  endif
-.  if exists(${FILESDIR}/pkg-install${COMPONENT}.in)
-SUB_FILES+=	pkg-install${COMPONENT}
-PLIST_SUB+=	PG_USER=${PG_USER}
-.  endif
-
-post-patch:
-.  if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU}
-	@${REINPLACE_CMD} \
-		-e '/m4_PACKAGE_VERSION/s/\[2\.6[0-9]\]/m4_defn([m4_PACKAGE_VERSION])/' \
-		-e '/icu/s/_57//' \
-		${WRKSRC}/configure.in
-.  endif
-
-do-install:
-	@for dir in ${INSTALL_DIRS}; do \
-	    cd ${WRKSRC}/$${dir} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \
-	done
-.  if defined(SERVER_ONLY)
-	@ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\
-	${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
-			${STAGEDIR}${PREFIX}/etc/periodic/daily
-.  endif # SERVER_ONLY
-.  if defined(CLIENT_ONLY)
-	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
-.  endif
-	@ if [ -r ${PKGMESSAGE} ]; then \
-		${MKDIR} ${STAGEDIR}${DOCSDIR} ;\
-		${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\
-	fi
-.endif # !NO_BUILD
-
-.if defined(SERVER_ONLY)
-check:
-	@if [ `id -u` != 0 ] ; then \
-	  ${ECHO} "Running postgresql regressions tests" ;\
-	  cd ${WRKSRC}; ${MAKE_CMD} check ;\
-	 else \
-	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
-	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
-	 fi
-.endif
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../postgresql12-server/Makefile"

Modified: head/databases/postgresql11-server/distinfo
==============================================================================
--- head/databases/postgresql11-server/distinfo	Thu Aug  8 15:29:38 2019	(r508389)
+++ head/databases/postgresql11-server/distinfo	Thu Aug  8 15:33:02 2019	(r508390)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561409449
-SHA256 (postgresql/postgresql-11.4.tar.bz2) = 02802ddffd1590805beddd1e464dd28a46a41a5f1e1df04bab4f46663195cc8b
-SIZE (postgresql/postgresql-11.4.tar.bz2) = 19759635
+TIMESTAMP = 1565174257
+SHA256 (postgresql/postgresql-11.5.tar.bz2) = 7fdf23060bfc715144cbf2696cf05b0fa284ad3eb21f0c378591c6bca99ad180
+SIZE (postgresql/postgresql-11.5.tar.bz2) = 19773087

Modified: head/databases/postgresql12-client/Makefile
==============================================================================
--- head/databases/postgresql11-client/Makefile	Wed Aug  7 10:37:10 2019	(r508310)
+++ head/databases/postgresql12-client/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	PostgreSQL database (client)
 
-MASTERDIR=	${.CURDIR}/../postgresql11-server
+MASTERDIR=	${.CURDIR}/../postgresql12-server
 
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \

Modified: head/databases/postgresql12-contrib/Makefile
==============================================================================
--- head/databases/postgresql11-contrib/Makefile	Wed Aug  7 10:37:10 2019	(r508310)
+++ head/databases/postgresql12-contrib/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	pgsql@FreeBSD.org
@@ -11,9 +11,9 @@ COMMENT=	The contrib utilities from the PostgreSQL dis
 LIB_DEPENDS=	libxslt.so:textproc/libxslt \
 		libxml2.so:textproc/libxml2
 
-MASTERDIR=	${.CURDIR}/../postgresql11-server
+MASTERDIR=	${.CURDIR}/../postgresql12-server
 
-USES=		bison pgsql:11
+USES=		bison pgsql:12
 
 BUILD_DIRS=	src/port src/include src/common contrib
 INSTALL_DIRS=	contrib

Modified: head/databases/postgresql12-docs/Makefile
==============================================================================
--- head/databases/postgresql96-docs/Makefile	Wed Aug  7 10:37:10 2019	(r508310)
+++ head/databases/postgresql12-docs/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S,.,,}-docs
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The PostgreSQL documentation set
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
-WANT_PGSQL_VER?=9.6
+WANT_PGSQL_VER?=12
 
 DISTV=		${DISTVERSION:R}
 

Modified: head/databases/postgresql12-pgtcl/Makefile
==============================================================================
--- head/databases/postgresql11-pgtcl/Makefile	Wed Aug  7 10:37:10 2019	(r508310)
+++ head/databases/postgresql12-pgtcl/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-PORTREVISION=	1
-PKGNAMESUFFIX=	-postgresql11
+PORTREVISION=	0
+PKGNAMESUFFIX=	-postgresql12
 
-CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql10-*
+CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql1[013-9]-*
 
-PGTCL_SLAVE=	11
+PGTCL_SLAVE=	12
 MASTERDIR=	${.CURDIR}/../pgtcl
 
 .include "${MASTERDIR}/Makefile"

Modified: head/databases/postgresql12-plperl/Makefile
==============================================================================
--- head/databases/postgresql95-plperl/Makefile	Wed Aug  7 10:37:10 2019	(r508310)
+++ head/databases/postgresql12-plperl/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -3,7 +3,7 @@
 
 PORTNAME=	postgresql
 # Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases perl5
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
@@ -14,7 +14,7 @@ RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
 
-WANT_PGSQL_VER?=9.5
+WANT_PGSQL_VER?=12
 
 USES+=		perl5 readline
 CONFIGURE_ARGS=	--with-perl

Modified: head/databases/postgresql12-plpython/Makefile
==============================================================================
--- head/databases/postgresql95-plpython/Makefile	Wed Aug  7 10:37:10 2019	(r508310)
+++ head/databases/postgresql12-plpython/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -3,7 +3,7 @@
 PORTNAME=	postgresql
 CATEGORIES=	databases python
 # Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
@@ -14,7 +14,7 @@ WANT_PGSQL=	server
 
 MASTERDIR=	${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server
 
-WANT_PGSQL_VER?=	9.5
+WANT_PGSQL_VER?=	12
 WANT_PYTHON_USE?=	python
 
 CONFIGURE_ARGS=	--with-python

Modified: head/databases/postgresql12-pltcl/Makefile
==============================================================================
--- head/databases/postgresql96-pltcl/Makefile	Wed Aug  7 10:37:10 2019	(r508310)
+++ head/databases/postgresql12-pltcl/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -3,7 +3,7 @@
 
 PORTNAME=	postgresql
 # Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	databases tcl
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
@@ -12,7 +12,7 @@ COMMENT=	Module for using Tcl to write SQL functions
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
 
-WANT_PGSQL_VER?=9.6
+WANT_PGSQL_VER?=12
 
 USES+=		tcl pgsql:${WANT_PGSQL_VER}
 WANT_PGSQL=	server

Modified: head/databases/postgresql12-server/Makefile
==============================================================================
--- head/databases/postgresql11-server/Makefile	Mon Jul  1 11:29:57 2019	(r505566)
+++ head/databases/postgresql12-server/Makefile	Thu Aug  8 15:33:02 2019	(r508390)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	11.4
+DISTVERSION?=	12beta3
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
@@ -55,8 +55,9 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/snowball src/backend/replication/libpqwalreceiver \
 		src/backend/replication/pgoutput \
 		src/bin/initdb src/bin/pg_ctl \
+		src/bin/pg_archivecleanup src/bin/pg_basebackup \
+		src/bin/pg_checksums \
 		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
-		src/bin/pg_basebackup src/bin/pg_archivecleanup \
 		src/bin/pg_rewind \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade

Modified: head/databases/postgresql12-server/distinfo
==============================================================================
--- head/databases/postgresql11-server/distinfo	Mon Jul  1 11:29:57 2019	(r505566)
+++ head/databases/postgresql12-server/distinfo	Thu Aug  8 15:33:02 2019	(r508390)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561409449
-SHA256 (postgresql/postgresql-11.4.tar.bz2) = 02802ddffd1590805beddd1e464dd28a46a41a5f1e1df04bab4f46663195cc8b
-SIZE (postgresql/postgresql-11.4.tar.bz2) = 19759635
+TIMESTAMP = 1565174257
+SHA256 (postgresql/postgresql-12beta3.tar.bz2) = e4a4079c75bf049349c70a02f705beecbb8263684ff2d4e13a582a3ff50332aa
+SIZE (postgresql/postgresql-12beta3.tar.bz2) = 20698785

Modified: head/databases/postgresql12-server/pkg-plist-client
==============================================================================
--- head/databases/postgresql11-server/pkg-plist-client	Mon Jul  1 11:29:57 2019	(r505566)
+++ head/databases/postgresql12-server/pkg-plist-client	Thu Aug  8 15:33:02 2019	(r508390)
@@ -78,6 +78,7 @@ include/postgresql/server/access/nbtxlog.h
 include/postgresql/server/access/parallel.h
 include/postgresql/server/access/printsimple.h
 include/postgresql/server/access/printtup.h
+include/postgresql/server/access/relation.h
 include/postgresql/server/access/reloptions.h
 include/postgresql/server/access/relscan.h
 include/postgresql/server/access/rewriteheap.h
@@ -93,6 +94,8 @@ include/postgresql/server/access/spgxlog.h
 include/postgresql/server/access/stratnum.h
 include/postgresql/server/access/subtrans.h
 include/postgresql/server/access/sysattr.h
+include/postgresql/server/access/table.h
+include/postgresql/server/access/tableam.h
 include/postgresql/server/access/timeline.h
 include/postgresql/server/access/transam.h
 include/postgresql/server/access/tsmapi.h
@@ -229,6 +232,8 @@ include/postgresql/server/catalog/pg_statistic.h
 include/postgresql/server/catalog/pg_statistic_d.h
 include/postgresql/server/catalog/pg_statistic_ext.h
 include/postgresql/server/catalog/pg_statistic_ext_d.h
+include/postgresql/server/catalog/pg_statistic_ext_data.h
+include/postgresql/server/catalog/pg_statistic_ext_data_d.h
 include/postgresql/server/catalog/pg_subscription.h
 include/postgresql/server/catalog/pg_subscription_d.h
 include/postgresql/server/catalog/pg_subscription_rel.h
@@ -302,6 +307,9 @@ include/postgresql/server/common/int.h
 include/postgresql/server/common/int128.h
 include/postgresql/server/common/ip.h
 include/postgresql/server/common/keywords.h
+include/postgresql/server/common/kwlookup.h
+include/postgresql/server/common/link-canary.h
+include/postgresql/server/common/logging.h
 include/postgresql/server/common/md5.h
 include/postgresql/server/common/pg_lzcompress.h
 include/postgresql/server/common/relpath.h
@@ -309,12 +317,12 @@ include/postgresql/server/common/restricted_token.h
 include/postgresql/server/common/saslprep.h
 include/postgresql/server/common/scram-common.h
 include/postgresql/server/common/sha2.h
+include/postgresql/server/common/shortest_dec.h
 include/postgresql/server/common/string.h
 include/postgresql/server/common/unicode_norm.h
 include/postgresql/server/common/unicode_norm_table.h
 include/postgresql/server/common/username.h
 include/postgresql/server/datatype/timestamp.h
-include/postgresql/server/dynloader.h
 include/postgresql/server/executor/execExpr.h
 include/postgresql/server/executor/execParallel.h
 include/postgresql/server/executor/execPartition.h
@@ -393,6 +401,7 @@ include/postgresql/server/lib/bloomfilter.h
 include/postgresql/server/lib/dshash.h
 include/postgresql/server/lib/hyperloglog.h
 include/postgresql/server/lib/ilist.h
+include/postgresql/server/lib/integerset.h
 include/postgresql/server/lib/knapsack.h
 include/postgresql/server/lib/pairingheap.h
 include/postgresql/server/lib/rbtree.h
@@ -400,6 +409,7 @@ include/postgresql/server/lib/simplehash.h
 include/postgresql/server/lib/stringinfo.h
 include/postgresql/server/libpq/auth.h
 include/postgresql/server/libpq/be-fsstubs.h
+include/postgresql/server/libpq/be-gssapi-common.h
 include/postgresql/server/libpq/crypt.h
 include/postgresql/server/libpq/hba.h
 include/postgresql/server/libpq/ifaddr.h
@@ -423,15 +433,17 @@ include/postgresql/server/nodes/nodeFuncs.h
 include/postgresql/server/nodes/nodes.h
 include/postgresql/server/nodes/params.h
 include/postgresql/server/nodes/parsenodes.h
+include/postgresql/server/nodes/pathnodes.h
 include/postgresql/server/nodes/pg_list.h
 include/postgresql/server/nodes/plannodes.h
 include/postgresql/server/nodes/primnodes.h
 include/postgresql/server/nodes/print.h
 include/postgresql/server/nodes/readfuncs.h
-include/postgresql/server/nodes/relation.h
 include/postgresql/server/nodes/replnodes.h
+include/postgresql/server/nodes/supportnodes.h
 include/postgresql/server/nodes/tidbitmap.h
 include/postgresql/server/nodes/value.h
+include/postgresql/server/optimizer/appendinfo.h
 include/postgresql/server/optimizer/clauses.h
 include/postgresql/server/optimizer/cost.h
 include/postgresql/server/optimizer/geqo.h
@@ -440,7 +452,28 @@ include/postgresql/server/optimizer/geqo_gene.h
 include/postgresql/server/optimizer/geqo_misc.h
 include/postgresql/server/optimizer/geqo_mutation.h
 include/postgresql/server/optimizer/geqo_pool.h
-include/postgresql/server/optimizer/geqo_random.h
+include/postgresql/server/optimizer/inherit.h
+include/postgresql/server/optimizer/optimizer.h
+include/postgresql/server/partitioning/partdesc.h
+include/postgresql/server/port/pg_bitutils.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_indonesian.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_irish.h
+include/postgresql/server/snowball/libstemmer/stem_ISO_8859_2_hungarian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_arabic.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_indonesian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_irish.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_lithuanian.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_nepali.h
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_tamil.h
+include/postgresql/server/storage/md.h
+include/postgresql/server/storage/sync.h
+include/postgresql/server/utils/float.h
+include/postgresql/server/utils/jsonpath.h
+lib/libecpg.so.7
+lib/libpgport_shlib.a
+man/man1/pg_checksums.1.gz
+man/man3/SPI_commit_and_chain.3.gz
+man/man3/SPI_rollback_and_chain.3.gz
 include/postgresql/server/optimizer/geqo_recombination.h
 include/postgresql/server/optimizer/geqo_selection.h
 include/postgresql/server/optimizer/joininfo.h
@@ -452,12 +485,10 @@ include/postgresql/server/optimizer/placeholder.h
 include/postgresql/server/optimizer/plancat.h
 include/postgresql/server/optimizer/planmain.h
 include/postgresql/server/optimizer/planner.h
-include/postgresql/server/optimizer/predtest.h
 include/postgresql/server/optimizer/prep.h
 include/postgresql/server/optimizer/restrictinfo.h
 include/postgresql/server/optimizer/subselect.h
 include/postgresql/server/optimizer/tlist.h
-include/postgresql/server/optimizer/var.h
 include/postgresql/server/parser/analyze.h
 include/postgresql/server/parser/gram.h
 include/postgresql/server/parser/gramparse.h
@@ -591,7 +622,6 @@ include/postgresql/server/snowball/libstemmer/stem_ISO
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_finnish.h
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_french.h
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_german.h
-include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_hungarian.h
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_italian.h
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_norwegian.h
 include/postgresql/server/snowball/libstemmer/stem_ISO_8859_1_porter.h
@@ -690,7 +720,6 @@ include/postgresql/server/utils/array.h
 include/postgresql/server/utils/arrayaccess.h
 include/postgresql/server/utils/ascii.h
 include/postgresql/server/utils/attoptcache.h
-include/postgresql/server/utils/backend_random.h
 include/postgresql/server/utils/builtins.h
 include/postgresql/server/utils/bytea.h
 include/postgresql/server/utils/cash.h
@@ -701,7 +730,6 @@ include/postgresql/server/utils/datetime.h
 include/postgresql/server/utils/datum.h
 include/postgresql/server/utils/dsa.h
 include/postgresql/server/utils/dynahash.h
-include/postgresql/server/utils/dynamic_loader.h
 include/postgresql/server/utils/elog.h
 include/postgresql/server/utils/errcodes.h
 include/postgresql/server/utils/evtcache.h
@@ -729,7 +757,6 @@ include/postgresql/server/utils/logtape.h
 include/postgresql/server/utils/lsyscache.h
 include/postgresql/server/utils/memdebug.h
 include/postgresql/server/utils/memutils.h
-include/postgresql/server/utils/nabstime.h
 include/postgresql/server/utils/numeric.h
 include/postgresql/server/utils/palloc.h
 include/postgresql/server/utils/partcache.h
@@ -765,7 +792,6 @@ include/postgresql/server/utils/spccache.h
 include/postgresql/server/utils/syscache.h
 include/postgresql/server/utils/timeout.h
 include/postgresql/server/utils/timestamp.h
-include/postgresql/server/utils/tqual.h
 include/postgresql/server/utils/tuplesort.h
 include/postgresql/server/utils/tuplestore.h
 include/postgresql/server/utils/typcache.h
@@ -782,7 +808,6 @@ include/sqlda-native.h
 include/sqlda.h
 lib/libecpg.a
 lib/libecpg.so
-lib/libecpg.so.6
 lib/libecpg_compat.a
 lib/libecpg_compat.so
 lib/libecpg_compat.so.3
@@ -830,7 +855,6 @@ man/man1/pg_standby.1.gz
 man/man1/pg_test_fsync.1.gz
 man/man1/pg_test_timing.1.gz
 man/man1/pg_upgrade.1.gz
-man/man1/pg_verify_checksums.1.gz
 man/man1/pg_waldump.1.gz
 man/man1/pgbench.1.gz
 man/man1/postgres.1.gz
@@ -1093,110 +1117,113 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/README-client
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-11.mo
+%%NLS%%include/postgresql/server/optimizer/geqo_random.h
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-12.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib7-12.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-12.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-12.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-12.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-12.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-12.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpg-12.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpglib7-12.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libpq5-12.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_config-12.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-12.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-12.mo
+%%NLS%%share/locale/de/LC_MESSAGES/psql-12.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpg-12.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpglib7-12.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libpq5-12.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_config-12.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-12.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-12.mo
+%%NLS%%share/locale/es/LC_MESSAGES/psql-12.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-12.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib7-12.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-12.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-12.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-12.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-12.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/psql-12.mo
+%%NLS%%share/locale/he/LC_MESSAGES/libpq5-12.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_config-12.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_dump-12.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-12.mo
+%%NLS%%share/locale/he/LC_MESSAGES/psql-12.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpg-12.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpglib7-12.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libpq5-12.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_config-12.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-12.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-12.mo
+%%NLS%%share/locale/it/LC_MESSAGES/psql-12.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-12.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib7-12.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-12.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-12.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-12.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-12.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/psql-12.mo

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908081533.x78FX3J8008298>