summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/postgresql10-plperl/Makefile2
-rw-r--r--databases/postgresql10-plpython/Makefile2
-rw-r--r--databases/postgresql10-server/Makefile2
-rw-r--r--databases/postgresql10-server/distinfo6
-rw-r--r--databases/postgresql10-server/pkg-plist-plperl5
-rw-r--r--databases/postgresql10-server/pkg-plist-plpython14
-rw-r--r--databases/postgresql10-server/pkg-plist-server1
-rw-r--r--databases/postgresql11-server/Makefile2
-rw-r--r--databases/postgresql11-server/distinfo6
-rw-r--r--databases/postgresql11-server/pkg-plist-plperl10
-rw-r--r--databases/postgresql11-server/pkg-plist-plpython21
-rw-r--r--databases/postgresql11-server/pkg-plist-server1
-rw-r--r--databases/postgresql12-plperl/Makefile4
-rw-r--r--databases/postgresql12-plpython/Makefile4
-rw-r--r--databases/postgresql12-server/Makefile5
-rw-r--r--databases/postgresql12-server/distinfo6
-rw-r--r--databases/postgresql12-server/pkg-install-server3
-rw-r--r--databases/postgresql12-server/pkg-plist-client2
-rw-r--r--databases/postgresql12-server/pkg-plist-plperl10
-rw-r--r--databases/postgresql12-server/pkg-plist-plpython21
-rw-r--r--databases/postgresql12-server/pkg-plist-server6
-rw-r--r--databases/postgresql94-plpython/Makefile2
-rw-r--r--databases/postgresql95-plperl/Makefile2
-rw-r--r--databases/postgresql95-plpython/Makefile2
-rw-r--r--databases/postgresql95-server/Makefile2
-rw-r--r--databases/postgresql95-server/distinfo6
-rw-r--r--databases/postgresql95-server/pkg-plist-plperl5
-rw-r--r--databases/postgresql95-server/pkg-plist-plpython14
-rw-r--r--databases/postgresql95-server/pkg-plist-server1
-rw-r--r--databases/postgresql96-plperl/Makefile2
-rw-r--r--databases/postgresql96-plpython/Makefile2
-rw-r--r--databases/postgresql96-server/Makefile4
-rw-r--r--databases/postgresql96-server/distinfo6
-rw-r--r--databases/postgresql96-server/pkg-plist-plperl5
-rw-r--r--databases/postgresql96-server/pkg-plist-plpython14
-rw-r--r--databases/postgresql96-server/pkg-plist-server1
36 files changed, 173 insertions, 28 deletions
diff --git a/databases/postgresql10-plperl/Makefile b/databases/postgresql10-plperl/Makefile
index f79739e44c37..d623f95d590f 100644
--- a/databases/postgresql10-plperl/Makefile
+++ b/databases/postgresql10-plperl/Makefile
@@ -3,4 +3,6 @@
WANT_PGSQL_VER= 10
+INSTALL_DIRS= src/pl/plperl contrib/hstore_plperl
+
.include "${.CURDIR}/../postgresql12-plperl/Makefile"
diff --git a/databases/postgresql10-plpython/Makefile b/databases/postgresql10-plpython/Makefile
index fa36738cb601..feab1421b659 100644
--- a/databases/postgresql10-plpython/Makefile
+++ b/databases/postgresql10-plpython/Makefile
@@ -2,4 +2,6 @@
WANT_PGSQL_VER= 10
+INSTALL_DIRS= src/pl/plpython contrib/hstore_plpython contrib/ltree_plpython
+
.include "${.CURDIR}/../postgresql12-plpython/Makefile"
diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
index 935247dbbdd6..ccaf45c91edd 100644
--- a/databases/postgresql10-server/Makefile
+++ b/databases/postgresql10-server/Makefile
@@ -1,7 +1,7 @@
# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
# $FreeBSD$
-DISTVERSION?= 10.12
+DISTVERSION?= 10.13
# 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?= 2
diff --git a/databases/postgresql10-server/distinfo b/databases/postgresql10-server/distinfo
index e77b68928930..e009b4e65769 100644
--- a/databases/postgresql10-server/distinfo
+++ b/databases/postgresql10-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581419815
-SHA256 (postgresql/postgresql-10.12.tar.bz2) = 388f7f888c4fbcbdf424ec2bce52535195b426010b720af7bea767e23e594ae7
-SIZE (postgresql/postgresql-10.12.tar.bz2) = 19020488
+TIMESTAMP = 1589614618
+SHA256 (postgresql/postgresql-10.13.tar.bz2) = 4d701f450cd92ffb123cf6c296e9656abbc2ab7ea6507894ff1e2475ae0754e1
+SIZE (postgresql/postgresql-10.13.tar.bz2) = 19028339
diff --git a/databases/postgresql10-server/pkg-plist-plperl b/databases/postgresql10-server/pkg-plist-plperl
index 989ca3f8e1cb..60809e548820 100644
--- a/databases/postgresql10-server/pkg-plist-plperl
+++ b/databases/postgresql10-server/pkg-plist-plperl
@@ -8,3 +8,8 @@ include/postgresql/server/ppport.h
%%DATADIR%%/extension/plperl--unpackaged--1.0.sql
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
+lib/postgresql/hstore_plperl.so
+%%DATADIR%%/extension/hstore_plperl--1.0.sql
+%%DATADIR%%/extension/hstore_plperl.control
+%%DATADIR%%/extension/hstore_plperlu--1.0.sql
+%%DATADIR%%/extension/hstore_plperlu.control
diff --git a/databases/postgresql10-server/pkg-plist-plpython b/databases/postgresql10-server/pkg-plist-plpython
index 49d2377e4136..592925659278 100644
--- a/databases/postgresql10-server/pkg-plist-plpython
+++ b/databases/postgresql10-server/pkg-plist-plpython
@@ -12,3 +12,17 @@ include/postgresql/server/plpython.h
%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
+lib/postgresql/hstore_plpython3.so
+lib/postgresql/ltree_plpython3.so
+%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython2u.control
+%%DATADIR%%/extension/hstore_plpython3u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython3u.control
+%%DATADIR%%/extension/hstore_plpythonu--1.0.sql
+%%DATADIR%%/extension/hstore_plpythonu.control
+%%DATADIR%%/extension/ltree_plpython2u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython2u.control
+%%DATADIR%%/extension/ltree_plpython3u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython3u.control
+%%DATADIR%%/extension/ltree_plpythonu--1.0.sql
+%%DATADIR%%/extension/ltree_plpythonu.control
diff --git a/databases/postgresql10-server/pkg-plist-server b/databases/postgresql10-server/pkg-plist-server
index cb26c2721916..8d3af831ba5f 100644
--- a/databases/postgresql10-server/pkg-plist-server
+++ b/databases/postgresql10-server/pkg-plist-server
@@ -389,6 +389,7 @@ lib/libpgcommon.a
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
+%%TZDATA%%%%DATADIR%%/timezone/America/Nuuk
%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
%%TZDATA%%%%DATADIR%%/timezone/America/Panama
%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung
diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile
index fcc8552308d6..7d8929ae0323 100644
--- a/databases/postgresql11-server/Makefile
+++ b/databases/postgresql11-server/Makefile
@@ -1,7 +1,7 @@
# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
# $FreeBSD$
-DISTVERSION?= 11.7
+DISTVERSION?= 11.8
# 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?= 2
diff --git a/databases/postgresql11-server/distinfo b/databases/postgresql11-server/distinfo
index c10f3b8186db..6e88088d9d91 100644
--- a/databases/postgresql11-server/distinfo
+++ b/databases/postgresql11-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581419816
-SHA256 (postgresql/postgresql-11.7.tar.bz2) = 324ae93a8846fbb6a25d562d271bc441ffa8794654c5b2839384834de220a313
-SIZE (postgresql/postgresql-11.7.tar.bz2) = 19890063
+TIMESTAMP = 1589613918
+SHA256 (postgresql/postgresql-11.8.tar.bz2) = eaf2f4329ccc349c89e950761b81daf8c99bb8966abcab5665ccd6ee95c77ae2
+SIZE (postgresql/postgresql-11.8.tar.bz2) = 19922770
diff --git a/databases/postgresql11-server/pkg-plist-plperl b/databases/postgresql11-server/pkg-plist-plperl
index d2923d23d6d6..93081938fd08 100644
--- a/databases/postgresql11-server/pkg-plist-plperl
+++ b/databases/postgresql11-server/pkg-plist-plperl
@@ -9,3 +9,13 @@ include/postgresql/server/ppport.h
%%DATADIR%%/extension/plperl--unpackaged--1.0.sql
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
+lib/postgresql/hstore_plperl.so
+lib/postgresql/jsonb_plperl.so
+%%DATADIR%%/extension/hstore_plperl--1.0.sql
+%%DATADIR%%/extension/hstore_plperl.control
+%%DATADIR%%/extension/hstore_plperlu--1.0.sql
+%%DATADIR%%/extension/hstore_plperlu.control
+%%DATADIR%%/extension/jsonb_plperl--1.0.sql
+%%DATADIR%%/extension/jsonb_plperl.control
+%%DATADIR%%/extension/jsonb_plperlu--1.0.sql
+%%DATADIR%%/extension/jsonb_plperlu.control
diff --git a/databases/postgresql11-server/pkg-plist-plpython b/databases/postgresql11-server/pkg-plist-plpython
index da847844d322..8ecdbbea15a3 100644
--- a/databases/postgresql11-server/pkg-plist-plpython
+++ b/databases/postgresql11-server/pkg-plist-plpython
@@ -24,3 +24,24 @@ lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
+lib/postgresql/hstore_plpython3.so
+lib/postgresql/jsonb_plpython3.so
+lib/postgresql/ltree_plpython3.so
+%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython2u.control
+%%DATADIR%%/extension/hstore_plpython3u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython3u.control
+%%DATADIR%%/extension/hstore_plpythonu--1.0.sql
+%%DATADIR%%/extension/hstore_plpythonu.control
+%%DATADIR%%/extension/jsonb_plpython2u--1.0.sql
+%%DATADIR%%/extension/jsonb_plpython2u.control
+%%DATADIR%%/extension/jsonb_plpython3u--1.0.sql
+%%DATADIR%%/extension/jsonb_plpython3u.control
+%%DATADIR%%/extension/jsonb_plpythonu--1.0.sql
+%%DATADIR%%/extension/jsonb_plpythonu.control
+%%DATADIR%%/extension/ltree_plpython2u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython2u.control
+%%DATADIR%%/extension/ltree_plpython3u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython3u.control
+%%DATADIR%%/extension/ltree_plpythonu--1.0.sql
+%%DATADIR%%/extension/ltree_plpythonu.control
diff --git a/databases/postgresql11-server/pkg-plist-server b/databases/postgresql11-server/pkg-plist-server
index 48608c0c8613..31aec6d05bdd 100644
--- a/databases/postgresql11-server/pkg-plist-server
+++ b/databases/postgresql11-server/pkg-plist-server
@@ -1056,6 +1056,7 @@ lib/libpgcommon.a
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
+%%TZDATA%%%%DATADIR%%/timezone/America/Nuuk
%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
%%TZDATA%%%%DATADIR%%/timezone/America/Panama
%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung
diff --git a/databases/postgresql12-plperl/Makefile b/databases/postgresql12-plperl/Makefile
index 07394cd9557d..84f24af5f51e 100644
--- a/databases/postgresql12-plperl/Makefile
+++ b/databases/postgresql12-plperl/Makefile
@@ -19,8 +19,8 @@ WANT_PGSQL_VER?=12
USES+= perl5 readline
CONFIGURE_ARGS= --with-perl
-BUILD_DIRS= src/backend src/pl/plperl
-INSTALL_DIRS= src/pl/plperl
+BUILD_DIRS= src/backend ${INSTALL_DIRS}
+INSTALL_DIRS?= src/pl/plperl contrib/hstore_plperl contrib/jsonb_plperl
SLAVE_ONLY= yes
COMPONENT= -plperl
diff --git a/databases/postgresql12-plpython/Makefile b/databases/postgresql12-plpython/Makefile
index dea6d0d02cec..c4ec10c28d8a 100644
--- a/databases/postgresql12-plpython/Makefile
+++ b/databases/postgresql12-plpython/Makefile
@@ -20,8 +20,8 @@ WANT_PYTHON_USE?= python
CONFIGURE_ARGS= --with-python
COMPONENT= -plpython
-BUILD_DIRS= src/backend src/pl/plpython
-INSTALL_DIRS= src/pl/plpython
+BUILD_DIRS= src/backend ${INSTALL_DIRS}
+INSTALL_DIRS?= src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython
SLAVE_ONLY= yes
.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index 64f8e7191324..5f968888024e 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME?= postgresql
-DISTVERSION?= 12.2
+DISTVERSION?= 12.3
# 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?= 2
+PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= PGSQL/source/v${DISTVERSION}
PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
@@ -78,7 +78,6 @@ SUB_FILES+= 502.pgsql
.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}
diff --git a/databases/postgresql12-server/distinfo b/databases/postgresql12-server/distinfo
index 61f6a6f0d5db..38a554dc813c 100644
--- a/databases/postgresql12-server/distinfo
+++ b/databases/postgresql12-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581419817
-SHA256 (postgresql/postgresql-12.2.tar.bz2) = ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de
-SIZE (postgresql/postgresql-12.2.tar.bz2) = 20363545
+TIMESTAMP = 1589458709
+SHA256 (postgresql/postgresql-12.3.tar.bz2) = 94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41
+SIZE (postgresql/postgresql-12.3.tar.bz2) = 20439892
diff --git a/databases/postgresql12-server/pkg-install-server b/databases/postgresql12-server/pkg-install-server
index dff2f434764f..d4dcb95ca9a4 100644
--- a/databases/postgresql12-server/pkg-install-server
+++ b/databases/postgresql12-server/pkg-install-server
@@ -10,9 +10,10 @@ cat <<EOF
=========== BACKUP YOUR DATA! =============
As always, backup your data before
upgrading. If the upgrade leads to a higher
- minor revision (e.g. 8.3.x -> 8.4), a dump
+ major revision (e.g. 9.6 -> 10), a dump
and restore of all databases is
required. This is *NOT* done by the port!
+ See https://www.postgresql.org/docs/current/upgrading.html
===========================================
EOF
}
diff --git a/databases/postgresql12-server/pkg-plist-client b/databases/postgresql12-server/pkg-plist-client
index cc15abac37de..11d5e6227a0d 100644
--- a/databases/postgresql12-server/pkg-plist-client
+++ b/databases/postgresql12-server/pkg-plist-client
@@ -1199,6 +1199,8 @@ man/man7/WITH.7.gz
%%NLS%%share/locale/uk/LC_MESSAGES/ecpglib6-12.mo
%%NLS%%share/locale/uk/LC_MESSAGES/libpq5-12.mo
%%NLS%%share/locale/uk/LC_MESSAGES/pg_config-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_dump-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pgscripts-12.mo
%%NLS%%share/locale/uk/LC_MESSAGES/psql-12.mo
%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-12.mo
%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-12.mo
diff --git a/databases/postgresql12-server/pkg-plist-plperl b/databases/postgresql12-server/pkg-plist-plperl
index d2923d23d6d6..93081938fd08 100644
--- a/databases/postgresql12-server/pkg-plist-plperl
+++ b/databases/postgresql12-server/pkg-plist-plperl
@@ -9,3 +9,13 @@ include/postgresql/server/ppport.h
%%DATADIR%%/extension/plperl--unpackaged--1.0.sql
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
+lib/postgresql/hstore_plperl.so
+lib/postgresql/jsonb_plperl.so
+%%DATADIR%%/extension/hstore_plperl--1.0.sql
+%%DATADIR%%/extension/hstore_plperl.control
+%%DATADIR%%/extension/hstore_plperlu--1.0.sql
+%%DATADIR%%/extension/hstore_plperlu.control
+%%DATADIR%%/extension/jsonb_plperl--1.0.sql
+%%DATADIR%%/extension/jsonb_plperl.control
+%%DATADIR%%/extension/jsonb_plperlu--1.0.sql
+%%DATADIR%%/extension/jsonb_plperlu.control
diff --git a/databases/postgresql12-server/pkg-plist-plpython b/databases/postgresql12-server/pkg-plist-plpython
index da847844d322..8ecdbbea15a3 100644
--- a/databases/postgresql12-server/pkg-plist-plpython
+++ b/databases/postgresql12-server/pkg-plist-plpython
@@ -24,3 +24,24 @@ lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
+lib/postgresql/hstore_plpython3.so
+lib/postgresql/jsonb_plpython3.so
+lib/postgresql/ltree_plpython3.so
+%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython2u.control
+%%DATADIR%%/extension/hstore_plpython3u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython3u.control
+%%DATADIR%%/extension/hstore_plpythonu--1.0.sql
+%%DATADIR%%/extension/hstore_plpythonu.control
+%%DATADIR%%/extension/jsonb_plpython2u--1.0.sql
+%%DATADIR%%/extension/jsonb_plpython2u.control
+%%DATADIR%%/extension/jsonb_plpython3u--1.0.sql
+%%DATADIR%%/extension/jsonb_plpython3u.control
+%%DATADIR%%/extension/jsonb_plpythonu--1.0.sql
+%%DATADIR%%/extension/jsonb_plpythonu.control
+%%DATADIR%%/extension/ltree_plpython2u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython2u.control
+%%DATADIR%%/extension/ltree_plpython3u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython3u.control
+%%DATADIR%%/extension/ltree_plpythonu--1.0.sql
+%%DATADIR%%/extension/ltree_plpythonu.control
diff --git a/databases/postgresql12-server/pkg-plist-server b/databases/postgresql12-server/pkg-plist-server
index f1f69cab2fe7..05c50650e5c0 100644
--- a/databases/postgresql12-server/pkg-plist-server
+++ b/databases/postgresql12-server/pkg-plist-server
@@ -873,10 +873,15 @@ lib/libpgcommon.a
%%NLS%%share/locale/tr/LC_MESSAGES/postgres-12.mo
%%NLS%%share/locale/uk/LC_MESSAGES/initdb-12.mo
%%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-12.mo
%%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-12.mo
%%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_rewind-12.mo
%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_fsync-12.mo
%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-12.mo
%%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-12.mo
%%NLS%%share/locale/vi/LC_MESSAGES/pg_controldata-12.mo
%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_fsync-12.mo
@@ -1071,6 +1076,7 @@ lib/libpgcommon.a
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
+%%TZDATA%%%%DATADIR%%/timezone/America/Nuuk
%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
%%TZDATA%%%%DATADIR%%/timezone/America/Panama
%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung
diff --git a/databases/postgresql94-plpython/Makefile b/databases/postgresql94-plpython/Makefile
index 3a5509be8189..39bdf181e12f 100644
--- a/databases/postgresql94-plpython/Makefile
+++ b/databases/postgresql94-plpython/Makefile
@@ -2,4 +2,6 @@
WANT_PGSQL_VER= 9.4
+INSTALL_DIRS= src/pl/plpython contrib/hstore_plpython contrib/ltree_plpython
+
.include "${.CURDIR}/../postgresql12-plpython/Makefile"
diff --git a/databases/postgresql95-plperl/Makefile b/databases/postgresql95-plperl/Makefile
index 832de1fa4940..37905c28b134 100644
--- a/databases/postgresql95-plperl/Makefile
+++ b/databases/postgresql95-plperl/Makefile
@@ -3,4 +3,6 @@
WANT_PGSQL_VER= 9.5
+INSTALL_DIRS= src/pl/plperl contrib/hstore_plperl
+
.include "${.CURDIR}/../postgresql12-plperl/Makefile"
diff --git a/databases/postgresql95-plpython/Makefile b/databases/postgresql95-plpython/Makefile
index a5e70e9499d1..e6b6b52fa148 100644
--- a/databases/postgresql95-plpython/Makefile
+++ b/databases/postgresql95-plpython/Makefile
@@ -2,4 +2,6 @@
WANT_PGSQL_VER= 9.5
+INSTALL_DIRS= src/pl/plpython contrib/hstore_plpython contrib/ltree_plpython
+
.include "${.CURDIR}/../postgresql12-plpython/Makefile"
diff --git a/databases/postgresql95-server/Makefile b/databases/postgresql95-server/Makefile
index 2a23bcb2c806..ed3e38ab6a8e 100644
--- a/databases/postgresql95-server/Makefile
+++ b/databases/postgresql95-server/Makefile
@@ -1,7 +1,7 @@
# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
# $FreeBSD$
-DISTVERSION?= 9.5.21
+DISTVERSION?= 9.5.22
# 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
diff --git a/databases/postgresql95-server/distinfo b/databases/postgresql95-server/distinfo
index d0dbfe6e6a5b..e45f9276e8a1 100644
--- a/databases/postgresql95-server/distinfo
+++ b/databases/postgresql95-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1581419819
-SHA256 (postgresql/postgresql-9.5.21.tar.bz2) = 7eb56e4fa877243c2df78adc5a0ef02f851060c282682b4bb97b854100fb732c
-SIZE (postgresql/postgresql-9.5.21.tar.bz2) = 17640928
+TIMESTAMP = 1589613852
+SHA256 (postgresql/postgresql-9.5.22.tar.bz2) = 48555470a17248cb204d25ab1ad4231ef16295db55161922f006b9942d69640f
+SIZE (postgresql/postgresql-9.5.22.tar.bz2) = 17667386
SHA256 (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5fa083ec38087d6a0961642208f012e902221270708b919b92e9eedaa755e365
SIZE (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5952
diff --git a/databases/postgresql95-server/pkg-plist-plperl b/databases/postgresql95-server/pkg-plist-plperl
index 989ca3f8e1cb..38794a4209ac 100644
--- a/databases/postgresql95-server/pkg-plist-plperl
+++ b/databases/postgresql95-server/pkg-plist-plperl
@@ -7,4 +7,9 @@ include/postgresql/server/ppport.h
%%DATADIR%%/extension/plperlu--unpackaged--1.0.sql
%%DATADIR%%/extension/plperl--unpackaged--1.0.sql
%%DOCSDIR%%/README-plperl
+lib/postgresql/hstore_plperl.so
lib/postgresql/plperl.so
+%%DATADIR%%/extension/hstore_plperl--1.0.sql
+%%DATADIR%%/extension/hstore_plperl.control
+%%DATADIR%%/extension/hstore_plperlu--1.0.sql
+%%DATADIR%%/extension/hstore_plperlu.control
diff --git a/databases/postgresql95-server/pkg-plist-plpython b/databases/postgresql95-server/pkg-plist-plpython
index 49d2377e4136..592925659278 100644
--- a/databases/postgresql95-server/pkg-plist-plpython
+++ b/databases/postgresql95-server/pkg-plist-plpython
@@ -12,3 +12,17 @@ include/postgresql/server/plpython.h
%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
+lib/postgresql/hstore_plpython3.so
+lib/postgresql/ltree_plpython3.so
+%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython2u.control
+%%DATADIR%%/extension/hstore_plpython3u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython3u.control
+%%DATADIR%%/extension/hstore_plpythonu--1.0.sql
+%%DATADIR%%/extension/hstore_plpythonu.control
+%%DATADIR%%/extension/ltree_plpython2u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython2u.control
+%%DATADIR%%/extension/ltree_plpython3u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython3u.control
+%%DATADIR%%/extension/ltree_plpythonu--1.0.sql
+%%DATADIR%%/extension/ltree_plpythonu.control
diff --git a/databases/postgresql95-server/pkg-plist-server b/databases/postgresql95-server/pkg-plist-server
index be0433732081..5f7af40871c1 100644
--- a/databases/postgresql95-server/pkg-plist-server
+++ b/databases/postgresql95-server/pkg-plist-server
@@ -327,6 +327,7 @@ lib/libpgcommon.a
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
+%%TZDATA%%%%DATADIR%%/timezone/America/Nuuk
%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
%%TZDATA%%%%DATADIR%%/timezone/America/Panama
%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung
diff --git a/databases/postgresql96-plperl/Makefile b/databases/postgresql96-plperl/Makefile
index d1da538538f2..dd51b6f11143 100644
--- a/databases/postgresql96-plperl/Makefile
+++ b/databases/postgresql96-plperl/Makefile
@@ -3,4 +3,6 @@
WANT_PGSQL_VER= 9.6
+INSTALL_DIRS= src/pl/plperl contrib/hstore_plperl
+
.include "${.CURDIR}/../postgresql12-plperl/Makefile"
diff --git a/databases/postgresql96-plpython/Makefile b/databases/postgresql96-plpython/Makefile
index fbc92d7cc976..64b6dd74d617 100644
--- a/databases/postgresql96-plpython/Makefile
+++ b/databases/postgresql96-plpython/Makefile
@@ -2,4 +2,6 @@
WANT_PGSQL_VER= 9.6
+INSTALL_DIRS= src/pl/plpython contrib/hstore_plpython contrib/ltree_plpython
+
.include "${.CURDIR}/../postgresql12-plpython/Makefile"
diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile
index dbd363a59ee1..288be90e0e09 100644
--- a/databases/postgresql96-server/Makefile
+++ b/databases/postgresql96-server/Makefile
@@ -1,10 +1,10 @@
# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
# $FreeBSD$
-DISTVERSION?= 9.6.17
+DISTVERSION?= 9.6.18
# 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?= 2
+PORTREVISION?= 0
PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql96-server/distinfo b/databases/postgresql96-server/distinfo
index c0ee58c5e6ec..99cdd9a1a8b8 100644
--- a/databases/postgresql96-server/distinfo
+++ b/databases/postgresql96-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1581419696
-SHA256 (postgresql/postgresql-9.6.17.tar.bz2) = f6e1e32d32545f97c066f3c19f4d58dfab1205c01252cf85c5c92294ace1a0c2
-SIZE (postgresql/postgresql-9.6.17.tar.bz2) = 18812282
+TIMESTAMP = 1589458681
+SHA256 (postgresql/postgresql-9.6.18.tar.bz2) = 517ec282b785e6d22f360c30ba0c5e2a506fca5ca07dcc545427511d94c89999
+SIZE (postgresql/postgresql-9.6.18.tar.bz2) = 18836490
SHA256 (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 85f81baa0fc8f692bcf802c8645196d9e3afdef4f760cef712d940b87655486e
SIZE (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 5998
diff --git a/databases/postgresql96-server/pkg-plist-plperl b/databases/postgresql96-server/pkg-plist-plperl
index 989ca3f8e1cb..38794a4209ac 100644
--- a/databases/postgresql96-server/pkg-plist-plperl
+++ b/databases/postgresql96-server/pkg-plist-plperl
@@ -7,4 +7,9 @@ include/postgresql/server/ppport.h
%%DATADIR%%/extension/plperlu--unpackaged--1.0.sql
%%DATADIR%%/extension/plperl--unpackaged--1.0.sql
%%DOCSDIR%%/README-plperl
+lib/postgresql/hstore_plperl.so
lib/postgresql/plperl.so
+%%DATADIR%%/extension/hstore_plperl--1.0.sql
+%%DATADIR%%/extension/hstore_plperl.control
+%%DATADIR%%/extension/hstore_plperlu--1.0.sql
+%%DATADIR%%/extension/hstore_plperlu.control
diff --git a/databases/postgresql96-server/pkg-plist-plpython b/databases/postgresql96-server/pkg-plist-plpython
index 49d2377e4136..592925659278 100644
--- a/databases/postgresql96-server/pkg-plist-plpython
+++ b/databases/postgresql96-server/pkg-plist-plpython
@@ -12,3 +12,17 @@ include/postgresql/server/plpython.h
%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
+lib/postgresql/hstore_plpython3.so
+lib/postgresql/ltree_plpython3.so
+%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython2u.control
+%%DATADIR%%/extension/hstore_plpython3u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython3u.control
+%%DATADIR%%/extension/hstore_plpythonu--1.0.sql
+%%DATADIR%%/extension/hstore_plpythonu.control
+%%DATADIR%%/extension/ltree_plpython2u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython2u.control
+%%DATADIR%%/extension/ltree_plpython3u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython3u.control
+%%DATADIR%%/extension/ltree_plpythonu--1.0.sql
+%%DATADIR%%/extension/ltree_plpythonu.control
diff --git a/databases/postgresql96-server/pkg-plist-server b/databases/postgresql96-server/pkg-plist-server
index 2b4794a21b16..8ce8a9b27b00 100644
--- a/databases/postgresql96-server/pkg-plist-server
+++ b/databases/postgresql96-server/pkg-plist-server
@@ -342,6 +342,7 @@ lib/libpgcommon.a
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
+%%TZDATA%%%%DATADIR%%/timezone/America/Nuuk
%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
%%TZDATA%%%%DATADIR%%/timezone/America/Panama
%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung