git: 7b10329e431b - main - cleanup: Remove expired ports:

From: Rene Ladan <rene_at_FreeBSD.org>
Date: Fri, 11 Mar 2022 12:04:21 UTC
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7b10329e431b4bc020d0c00abe9c0022be6fe6a8

commit 7b10329e431b4bc020d0c00abe9c0022be6fe6a8
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2022-03-11 12:03:48 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2022-03-11 12:03:56 +0000

    cleanup: Remove expired ports:
    
    2022-03-11 databases/postgresql96-client: PostgreSQL-9.6 has reached end-of-life
    2022-03-11 databases/postgresql96-contrib: PostgreSQL-9.6 has reached end-of-life
    2022-03-11 databases/postgresql96-docs: PostgreSQL-9.6 has reached end-of-life
    databases/postgresql96-pgtcl: part of expired PostgreSQL 9.6
    2022-03-11 databases/postgresql96-plperl: PostgreSQL-9.6 has reached end-of-life
    2022-03-11 databases/postgresql96-plpython: PostgreSQL-9.6 has reached end-of-life
    2022-03-11 databases/postgresql96-pltcl: PostgreSQL-9.6 has reached end-of-life
    2022-03-11 databases/postgresql96-server: PostgreSQL-9.6 has reached end-of-life
---
 MOVED                                              |    8 +
 databases/Makefile                                 |    8 -
 databases/postgresql96-client/Makefile             |   20 -
 databases/postgresql96-contrib/Makefile            |   39 -
 databases/postgresql96-contrib/pkg-descr           |   23 -
 databases/postgresql96-docs/Makefile               |    5 -
 databases/postgresql96-pgtcl/Makefile              |    9 -
 databases/postgresql96-plperl/Makefile             |   10 -
 databases/postgresql96-plpython/Makefile           |    8 -
 databases/postgresql96-pltcl/Makefile              |    8 -
 databases/postgresql96-server/Makefile             |   27 -
 databases/postgresql96-server/distinfo             |    5 -
 databases/postgresql96-server/files/502.pgsql.in   |  114 ---
 databases/postgresql96-server/files/dot.cshrc.in   |   11 -
 databases/postgresql96-server/files/dot.profile.in |   22 -
 .../postgresql96-server/files/patch-doc-Makefile   |    9 -
 .../files/patch-doc-src-sgml-Makefile              |   46 -
 databases/postgresql96-server/files/patch-icu68    |  278 ------
 .../files/patch-src-Makefile.shlib                 |   11 -
 .../files/patch-src-backend-Makefile               |   11 -
 ...h-src_backend_utils_misc_postgresql.conf.sample |   21 -
 .../files/pkg-message-client.in                    |   38 -
 .../files/pkg-message-contrib.in                   |    9 -
 .../files/pkg-message-plperl.in                    |    9 -
 .../files/pkg-message-plpython.in                  |    9 -
 .../postgresql96-server/files/pkg-message-pltcl.in |    9 -
 .../files/pkg-message-server.in                    |   69 --
 .../postgresql96-server/files/pkgIndex.tcl.in      |    4 -
 databases/postgresql96-server/files/postgresql.in  |  115 ---
 databases/postgresql96-server/pkg-descr            |   23 -
 databases/postgresql96-server/pkg-install-server   |   22 -
 databases/postgresql96-server/pkg-plist-client     | 1051 --------------------
 databases/postgresql96-server/pkg-plist-contrib    |  241 -----
 databases/postgresql96-server/pkg-plist-plperl     |   15 -
 databases/postgresql96-server/pkg-plist-plpython   |   28 -
 databases/postgresql96-server/pkg-plist-pltcl      |   12 -
 databases/postgresql96-server/pkg-plist-server     |  801 ---------------
 37 files changed, 8 insertions(+), 3140 deletions(-)

diff --git a/MOVED b/MOVED
index c70be959eb2f..c844fb20047f 100644
--- a/MOVED
+++ b/MOVED
@@ -16950,3 +16950,11 @@ textproc/xmlada||2022-02-28|Removed, depends on expired lang/gcc6-aux
 x11-toolkits/gtkada||2022-02-28|Removed, depends on expired lang/gcc6-aux
 x11-toolkits/gtkada3||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/py-zsm-lib|sysutils/zsm|2022-03-07|Remove obsoleted port. Use sysutils/zsm instead
+databases/postgresql96-client||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
+databases/postgresql96-contrib||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
+databases/postgresql96-docs||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
+databases/postgresql96-pgtcl||2022-03-11|Removed, part of expired PostgresQL 9.6
+databases/postgresql96-plperl||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
+databases/postgresql96-plpython||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
+databases/postgresql96-pltcl||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
+databases/postgresql96-server||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
diff --git a/databases/Makefile b/databases/Makefile
index e4d610994905..a3a34d001d20 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -714,14 +714,6 @@
     SUBDIR += postgresql14-plpython
     SUBDIR += postgresql14-pltcl
     SUBDIR += postgresql14-server
-    SUBDIR += postgresql96-client
-    SUBDIR += postgresql96-contrib
-    SUBDIR += postgresql96-docs
-    SUBDIR += postgresql96-pgtcl
-    SUBDIR += postgresql96-plperl
-    SUBDIR += postgresql96-plpython
-    SUBDIR += postgresql96-pltcl
-    SUBDIR += postgresql96-server
     SUBDIR += powa-archivist
     SUBDIR += powa-web
     SUBDIR += powerarchitect
diff --git a/databases/postgresql96-client/Makefile b/databases/postgresql96-client/Makefile
deleted file mode 100644
index a627f1c34c5e..000000000000
--- a/databases/postgresql96-client/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
-PORTNAME=	postgresql
-PORTREVISION=	0
-
-COMMENT=	PostgreSQL database (client)
-
-MASTERDIR=	${.CURDIR}/../postgresql96-server
-
-BUILD_DIRS=	config src/include src/interfaces src/port \
-		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
-		src/bin/pgbench doc src/makefiles src/test/regress
-INSTALL_DIRS=	${BUILD_DIRS}
-
-CLIENT_ONLY=	yes
-COMPONENT=	-client
-USE_LDCONFIG=	yes
-USES=		pkgconfig
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql96-contrib/Makefile b/databases/postgresql96-contrib/Makefile
deleted file mode 100644
index 9f0a34777cc4..000000000000
--- a/databases/postgresql96-contrib/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
-PORTNAME=	postgresql
-PORTREVISION=	0
-CATEGORIES=	databases
-
-MAINTAINER=	pgsql@FreeBSD.org
-COMMENT=	The contrib utilities from the PostgreSQL distribution
-
-MASTERDIR=	${.CURDIR}/../postgresql96-server
-
-USES=		bison pgsql:9.6 ssl
-
-BUILD_DIRS=	src/port src/include src/common contrib
-INSTALL_DIRS=	contrib
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-SLAVE_ONLY=	yes
-COMPONENT=	-contrib
-CONFIGURE_ARGS+=--with-openssl --disable-nls --with-uuid=bsd
-LDFLAGS+=	-lpthread -L${PREFIX}/lib
-
-OPTIONS_DEFINE=	DOCS XML
-OPTIONS_DEFAULT=XML
-OPTIONS_SUB=	yes
-
-XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
-		libxml2.so:textproc/libxml2
-XML_CONFIGURE_WITH=	libxml libxslt
-
-post-configure: 
-		@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
-
-post-install:
-	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql96-contrib/pkg-descr b/databases/postgresql96-contrib/pkg-descr
deleted file mode 100644
index 18c3c1351c3b..000000000000
--- a/databases/postgresql96-contrib/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-This is the port for all stuff that comes in the contrib subtree of
-the postgresql distribution. This subtree contains porting tools,
-analysis utilities, and plug-in features that are not part of the core
-PostgreSQL system, mainly because they address a limited audience or
-are too experimental to be part of the main source tree.  This does
-not preclude their usefulness.
-
-Each subdirectory contains a README file with information about the
-module. Some directories supply new user-defined functions, operators,
-or types.  After you have installed the files you need to register the
-new entities in the database system by running the commands in the
-supplied .sql file.  For example,
-
-        $ psql -d dbname -f module.sql
-
-The .sql files are installed into /usr/local/share/postgresql/contrib
-
-For more information, please see
-/usr/local/share/doc/postgresql/contrib/README*
-
-This software is part of the standard PostgreSQL distribution.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql96-docs/Makefile b/databases/postgresql96-docs/Makefile
deleted file mode 100644
index fca44214c67d..000000000000
--- a/databases/postgresql96-docs/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
-WANT_PGSQL_VER=9.6
-
-.include "${.CURDIR}/../postgresql14-docs/Makefile"
diff --git a/databases/postgresql96-pgtcl/Makefile b/databases/postgresql96-pgtcl/Makefile
deleted file mode 100644
index a46a8135d229..000000000000
--- a/databases/postgresql96-pgtcl/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-PORTREVISION=	0
-PKGNAMESUFFIX=	-postgresql96
-
-CONFLICTS=	pgtcl pgtcl-postgresql9[01234]
-
-PGTCL_SLAVE=	9.6
-MASTERDIR=	${.CURDIR}/../pgtcl
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql96-plperl/Makefile b/databases/postgresql96-plperl/Makefile
deleted file mode 100644
index e3954311fb71..000000000000
--- a/databases/postgresql96-plperl/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
-WANT_PGSQL_VER=	9.6
-
-INSTALL_DIRS=	src/pl/plperl contrib/hstore_plperl
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-plperl/Makefile"
diff --git a/databases/postgresql96-plpython/Makefile b/databases/postgresql96-plpython/Makefile
deleted file mode 100644
index 0419cfc0b0c0..000000000000
--- a/databases/postgresql96-plpython/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-WANT_PGSQL_VER=	9.6
-
-INSTALL_DIRS=	src/pl/plpython contrib/hstore_plpython contrib/ltree_plpython
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-plpython/Makefile"
diff --git a/databases/postgresql96-pltcl/Makefile b/databases/postgresql96-pltcl/Makefile
deleted file mode 100644
index 328f4a504afe..000000000000
--- a/databases/postgresql96-pltcl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
-WANT_PGSQL_VER=	9.6
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-pltcl/Makefile"
diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile
deleted file mode 100644
index 410db95be675..000000000000
--- a/databases/postgresql96-server/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
-
-DISTVERSION?=	9.6.24
-# 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
-PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}${COMPONENT}
-
-MAINTAINER?=	pgsql@FreeBSD.org
-
-INSTALL_DIRS?=	src/common src/timezone src/backend \
-		src/backend/utils/mb/conversion_procs \
-		src/backend/snowball src/backend/replication/libpqwalreceiver \
-		src/bin/initdb src/bin/pg_ctl \
-		src/bin/pg_controldata src/bin/pg_resetxlog 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_xlogdump src/bin/pg_upgrade
-
-ICU_PATCHFILE=	pg-96b4-icu-2016-10-02.diff.gz
-OPTIONS_DEFAULT+=ICU
-
-DEPRECATED=	PostgreSQL-9.6 has reached end-of-life
-EXPIRATION_DATE=2022-03-11
-
-.include "${.CURDIR}/../postgresql14-server/Makefile"
diff --git a/databases/postgresql96-server/distinfo b/databases/postgresql96-server/distinfo
deleted file mode 100644
index 5bd281f7b6e1..000000000000
--- a/databases/postgresql96-server/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1636466915
-SHA256 (postgresql/postgresql-9.6.24.tar.bz2) = aeb7a196be3ebed1a7476ef565f39722187c108dd47da7489be9c4fcae982ace
-SIZE (postgresql/postgresql-9.6.24.tar.bz2) = 19047518
-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/files/502.pgsql.in b/databases/postgresql96-server/files/502.pgsql.in
deleted file mode 100644
index c2d5b885d2f1..000000000000
--- a/databases/postgresql96-server/files/502.pgsql.in
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-#
-# Maintenance shell script to vacuum and backup database
-# Put this in /usr/local/etc/periodic/daily, and it will be run 
-# every night
-#
-# Written by Palle Girgensohn <girgen@pingpong.net>
-#
-# In public domain, do what you like with it,
-# and use it at your own risk... :)
-#
-
-# Define these variables in either /etc/periodic.conf or
-# /etc/periodic.conf.local to override the default values.
-#
-# daily_pgsql_backup_enable="YES" # do backup of all databases
-# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
-# daily_pgsql_vacuum_enable="YES" # do vacuum
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-fi
-
-: ${daily_pgsql_user:="%%PG_USER%%"}
-: ${daily_pgsql_port:=5432}
-: ${daily_pgsql_vacuum_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz"}
-: ${daily_pgsql_pgdump_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c"}
-: ${daily_pgsql_pgdumpall_globals_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port}"}
-# backupdir is relative to ~pgsql home directory unless it begins with a slash:
-: ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
-: ${daily_pgsql_savedays:="7"}
-
-# allow '~´ in dir name
-eval backupdir=${daily_pgsql_backupdir}
-
-rc=0
-
-pgsql_backup() {
-	# daily_pgsql_backupdir must be writeable by user %%PG_USER%%
-	# ~%%PG_USER%% is just that under normal circumstances,
-	# but this might not be where you want the backups...
-	if [ ! -d ${backupdir} ] ; then 
-	    echo Creating ${backupdir}
-	    mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir}
-	fi
-
-	echo
-	echo "PostgreSQL backups"
-
-	# Protect the data
-	umask 077
-	rc=$?
-	now=`date "+%Y-%m-%dT%H:%M:%S"`
-	file=${daily_pgsql_backupdir}/pgglobals_${now}
-	su -l ${daily_pgsql_user} -c \
-		"umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz"
-
-	db=$1
-	while shift; do
-	    echo -n " $db"
-	    file=${backupdir}/pgdump_${db}_${now}
-	    su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
-	    [ $? -gt 0 ] && rc=3
-		db=$1
-	done
-
-	if [ $rc -gt 0 ]; then
-	    echo
-	    echo "Errors were reported during backup."
-	fi
-
-	# cleaning up old data
-	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
-	    -a -mtime +${daily_pgsql_savedays} -delete
-	echo
-}
-
-case "$daily_pgsql_backup_enable" in
-    [Yy][Ee][Ss])
-	dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
-	pgsql_backup $dbnames
-	;;
-
-	[Nn][Oo])
-	;;
-
-	"")
-	;;
-
-	*)
-	pgsql_backup $daily_pgsql_backup_enable
-	;;
-esac
-
-case "$daily_pgsql_vacuum_enable" in
-    [Yy][Ee][Ss])
-
-	echo
-	echo "PostgreSQL vacuum"
-	su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}"
-	if [ $? -gt 0 ]
-	then
-	    echo
-	    echo "Errors were reported during vacuum."
-	    rc=3
-	fi
-	;;
-esac
-
-exit $rc
diff --git a/databases/postgresql96-server/files/dot.cshrc.in b/databases/postgresql96-server/files/dot.cshrc.in
deleted file mode 100644
index 17c9ee69a7d0..000000000000
--- a/databases/postgresql96-server/files/dot.cshrc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-setenv PGLIB %%PREFIX%%/lib
-
-# note: PGDATA can be overridden by the -D startup option
-setenv PGDATA $HOME/data96
-
-#You might want to set some locale stuff here
-#setenv PGDATESTYLE ISO
-#setenv LC_ALL sv_SE.ISO_8859-1
-
-# if you want to make regression tests use this TZ
-#setenv TZ PST8PDT
diff --git a/databases/postgresql96-server/files/dot.profile.in b/databases/postgresql96-server/files/dot.profile.in
deleted file mode 100644
index 5be3e6a36ca9..000000000000
--- a/databases/postgresql96-server/files/dot.profile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-PGLIB=%%PREFIX%%/lib
-
-# note: PGDATA can be overridden by the -D startup option
-PGDATA=${HOME}/data96
-
-export PATH PGLIB PGDATA
-
-# if you use the periodic script from share/postgresql/502.pgsql, you
-# can set these
-#PGDUMP_ARGS="-b -F c"
-#PGBACKUPDIR=${HOME}/backups
-#PGBACKUP_SAVE_DAYS=7
-#export PGBACKUPDIR PGDUMP_ARGS PGBACKUP_SAVE_DAYS
-
-#You might want to set some locale stuff here
-#PGDATESTYLE=ISO
-#LC_ALL=sv_SE.ISO_8859-1
-#export PGDATESTYLE LC_ALL
-
-# if you want to make regression tests use this TZ
-#TZ=PST8PDT
-#export TZ
diff --git a/databases/postgresql96-server/files/patch-doc-Makefile b/databases/postgresql96-server/files/patch-doc-Makefile
deleted file mode 100644
index d5176bfb64b5..000000000000
--- a/databases/postgresql96-server/files/patch-doc-Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
---- doc/Makefile.orig	2015-10-08 21:45:57.360084007 +0200
-+++ doc/Makefile	2015-10-08 21:46:04.353084097 +0200
-@@ -12,5 +12,5 @@
- top_builddir = ..
- include $(top_builddir)/src/Makefile.global
- 
--all distprep html man install installdirs uninstall clean distclean maintainer-clean:
-+all distprep man install installdirs uninstall clean distclean maintainer-clean:
- 	$(MAKE) -C src $@
diff --git a/databases/postgresql96-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql96-server/files/patch-doc-src-sgml-Makefile
deleted file mode 100644
index 6e9522b1e45a..000000000000
--- a/databases/postgresql96-server/files/patch-doc-src-sgml-Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
---- doc/src/sgml/Makefile.orig	2015-10-05 21:09:44.000000000 +0200
-+++ doc/src/sgml/Makefile	2015-10-09 01:02:37.164797000 +0200
-@@ -15,7 +15,7 @@
- 
- # Make "html" the default target, since that is what most people tend
- # to want to use.
--html:
-+man:
- 
- NO_TEMP_INSTALL=yes
- 
-@@ -24,7 +24,7 @@
- include $(top_builddir)/src/Makefile.global
- 
- 
--all: html man
-+all: man
- 
- distprep: html distprep-man
- 
-@@ -81,8 +81,6 @@
- ## Man pages
- ##
- 
--man distprep-man: man-stamp
--
- man-stamp: stylesheet-man.xsl postgres.xml
- 	$(XMLLINT) --noout --valid postgres.xml
- 	$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
-@@ -326,14 +324,14 @@
- ## Install
- ##
- 
--install: install-html
-+install: install-man
- 
- ifneq ($(PORTNAME), sco)
- install: install-man
- endif
- 
- installdirs:
--	$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
-+	$(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
- 
- # If the install used a man directory shared with other applications, this will remove all files.
- uninstall:
diff --git a/databases/postgresql96-server/files/patch-icu68 b/databases/postgresql96-server/files/patch-icu68
deleted file mode 100644
index 90cd386d9480..000000000000
--- a/databases/postgresql96-server/files/patch-icu68
+++ /dev/null
@@ -1,278 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-dbcommands.c:770:1: error: conflicting types for 'dropdb'
-dropdb(const char *dbname, bool missing_ok)
-^
-../../../src/include/commands/dbcommands.h:23:13: note: previous declaration is here
-extern void dropdb(const char *dbname, bool missing_ok);
-            ^
-dbcommands.c:1367:1: error: conflicting types for 'AlterDatabase'
-AlterDatabase(AlterDatabaseStmt *stmt, bool isTopLevel)
-^
-../../../src/include/commands/dbcommands.h:25:12: note: previous declaration is here
-extern Oid      AlterDatabase(AlterDatabaseStmt *stmt, bool isTopLevel);
-                ^
-dbcommands.c:1977:1: error: conflicting types for 'get_database_oid'
-get_database_oid(const char *dbname, bool missing_ok)
-^
-../../../src/include/commands/dbcommands.h:29:12: note: previous declaration is here
-extern Oid      get_database_oid(const char *dbname, bool missingok);
-                ^
-indxpath.c:2917:1: error: conflicting types for 'relation_has_unique_index_for'
-relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel,
-^
-../../../../src/include/optimizer/paths.h:66:13: note: previous declaration is here
-extern bool relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel,
-            ^
-indxpath.c:3091:1: error: conflicting types for 'match_index_to_operand'
-match_index_to_operand(Node *operand,
-^
-../../../../src/include/optimizer/paths.h:69:13: note: previous declaration is here
-extern bool match_index_to_operand(Node *operand, int indexcol,
-            ^
-indxpath.c:3735:1: error: conflicting types for 'adjust_rowcompare_for_index'
-adjust_rowcompare_for_index(RowCompareExpr *clause,
-^
-../../../../src/include/optimizer/paths.h:75:14: note: previous declaration is here
-extern Expr *adjust_rowcompare_for_index(RowCompareExpr *clause,
-             ^
-regis.c:31:1: error: conflicting types for 'RS_isRegis'
-RS_isRegis(const char *str)
-^
-../../../src/include/tsearch/dicts/regis.h:41:7: note: previous declaration is here
-bool            RS_isRegis(const char *str);
-                ^
-regis.c:85:1: error: conflicting types for 'RS_compile'
-RS_compile(Regis *r, bool issuffix, const char *str)
-^
-../../../src/include/tsearch/dicts/regis.h:43:7: note: previous declaration is here
-void            RS_compile(Regis *r, bool issuffix, const char *str);
-                ^
-regis.c:218:1: error: conflicting types for 'RS_execute'
-RS_execute(Regis *r, char *str)
-^
-../../../src/include/tsearch/dicts/regis.h:47:7: note: previous declaration is here
-bool            RS_execute(Regis *r, char *str);
-                ^
-varlena.c:1845:1: error: conflicting types for 'varstr_sortsupport'
-varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar)
-^
-../../../../src/include/utils/builtins.h:849:13: note: previous declaration is here
-extern void varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar);
-            ^
-varlena.c:3264:1: error: conflicting types for 'SplitIdentifierString'
-SplitIdentifierString(char *rawstring, char separator,
-^
-../../../../src/include/utils/builtins.h:859:13: note: previous declaration is here
-extern bool SplitIdentifierString(char *rawstring, char separator,
-            ^
-varlena.c:3389:1: error: conflicting types for 'SplitDirectoriesString'
-SplitDirectoriesString(char *rawstring, char separator,
-^
-../../../../src/include/utils/builtins.h:861:13: note: previous declaration is here
-extern bool SplitDirectoriesString(char *rawstring, char separator,
-            ^
-varlena.c:3510:1: error: conflicting types for 'SplitGUCList'
-SplitGUCList(char *rawstring, char separator,
-^
-../../../../src/include/utils/builtins.h:863:13: note: previous declaration is here
-extern bool SplitGUCList(char *rawstring, char separator,
-            ^
-varlena.c:4022:1: error: conflicting types for 'replace_text_regexp'
-replace_text_regexp(text *src_text, void *regexp,
-^
-../../../../src/include/utils/builtins.h:866:14: note: previous declaration is here
-extern text *replace_text_regexp(text *src_text, void *regexp,
-             ^
-In file included from varlena.c:5586:
-./levenshtein.c:73:1: error: conflicting types for 'varstr_levenshtein'
-varstr_levenshtein(const char *source, int slen,
-^
-../../../../src/include/utils/builtins.h:850:12: note: previous declaration is here
-extern int varstr_levenshtein(const char *source, int slen,
-           ^
-In file included from varlena.c:5588:
-./levenshtein.c:68:1: error: conflicting types for 'varstr_levenshtein_less_equal'
-varstr_levenshtein_less_equal(const char *source, int slen,
-^
-../../../../src/include/utils/builtins.h:854:12: note: previous declaration is here
-extern int varstr_levenshtein_less_equal(const char *source, int slen,
-           ^
-guc.c:408:7: error: redefinition of 'log_duration' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_duration = false;
-                ^
-../../../../src/include/utils/guc.h:233:13: note: previous declaration is here
-extern bool log_duration;
-            ^
-guc.c:409:7: error: redefinition of 'Debug_print_plan' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            Debug_print_plan = false;
-                ^
-../../../../src/include/utils/guc.h:234:13: note: previous declaration is here
-extern bool Debug_print_plan;
-            ^
-guc.c:410:7: error: redefinition of 'Debug_print_parse' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            Debug_print_parse = false;
-                ^
-../../../../src/include/utils/guc.h:235:13: note: previous declaration is here
-extern bool Debug_print_parse;
-            ^
-guc.c:411:7: error: redefinition of 'Debug_print_rewritten' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            Debug_print_rewritten = false;
-                ^
-../../../../src/include/utils/guc.h:236:13: note: previous declaration is here
-extern bool Debug_print_rewritten;
-            ^
-guc.c:412:7: error: redefinition of 'Debug_pretty_print' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            Debug_pretty_print = true;
-                ^
-../../../../src/include/utils/guc.h:237:13: note: previous declaration is here
-extern bool Debug_pretty_print;
-            ^
-guc.c:414:7: error: redefinition of 'log_parser_stats' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_parser_stats = false;
-                ^
-../../../../src/include/utils/guc.h:239:13: note: previous declaration is here
-extern bool log_parser_stats;
-            ^
-guc.c:415:7: error: redefinition of 'log_planner_stats' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_planner_stats = false;
-                ^
-../../../../src/include/utils/guc.h:240:13: note: previous declaration is here
-extern bool log_planner_stats;
-            ^
-guc.c:416:7: error: redefinition of 'log_executor_stats' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_executor_stats = false;
-                ^
-../../../../src/include/utils/guc.h:241:13: note: previous declaration is here
-extern bool log_executor_stats;
-            ^
-guc.c:417:7: error: redefinition of 'log_statement_stats' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_statement_stats = false;            /* this is sort of all three
-                ^
-../../../../src/include/utils/guc.h:242:13: note: previous declaration is here
-extern bool log_statement_stats;
-            ^
-guc.c:419:7: error: redefinition of 'log_btree_build_stats' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_btree_build_stats = false;
-                ^
-../../../../src/include/utils/guc.h:243:13: note: previous declaration is here
-extern bool log_btree_build_stats;
-            ^
-guc.c:423:7: error: redefinition of 'check_function_bodies' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            check_function_bodies = true;
-                ^
-../../../../src/include/utils/guc.h:245:25: note: previous declaration is here
-extern PGDLLIMPORT bool check_function_bodies;
-                        ^
-guc.c:424:7: error: redefinition of 'default_with_oids' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            default_with_oids = false;
-                ^
-../../../../src/include/utils/guc.h:246:13: note: previous declaration is here
-extern bool default_with_oids;
-            ^
-guc.c:425:7: error: redefinition of 'SQL_inheritance' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            SQL_inheritance = true;
-                ^
-../../../../src/include/utils/guc.h:247:13: note: previous declaration is here
-extern bool SQL_inheritance;
-            ^
-guc.c:428:7: error: redefinition of 'session_auth_is_superuser' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            session_auth_is_superuser;
-                ^
-../../../../src/include/utils/guc.h:248:13: note: previous declaration is here
-extern bool     session_auth_is_superuser;
-                ^
-guc.c:4599:1: error: conflicting types for 'SelectConfigFiles'
-SelectConfigFiles(const char *userDoption, const char *progname)
-^
-../../../../src/include/utils/guc.h:355:13: note: previous declaration is here
-extern bool SelectConfigFiles(const char *userDoption, const char *progname);
-            ^
-guc.c:4989:1: error: conflicting types for 'AtEOXact_GUC'
-AtEOXact_GUC(bool isCommit, int nestLevel)
-^
-../../../../src/include/utils/guc.h:359:13: note: previous declaration is here
-extern void AtEOXact_GUC(bool isCommit, int nestLevel);
-            ^
-guc.c:5407:1: error: conflicting types for 'parse_int'
-parse_int(const char *value, int *result, int flags, const char **hintmsg)
-^
-../../../../src/include/utils/guc.h:362:13: note: previous declaration is here
-extern bool parse_int(const char *value, int *result, int flags,
-            ^
-guc.c:5493:1: error: conflicting types for 'parse_real'
-parse_real(const char *value, double *result)
-^
-../../../../src/include/utils/guc.h:364:13: note: previous declaration is here
-extern bool parse_real(const char *value, double *result);
-            ^
-guc.c:5554:1: error: conflicting types for 'config_enum_lookup_by_name'
-config_enum_lookup_by_name(struct config_enum * record, const char *value,
-^
-../../../../src/include/utils/guc_tables.h:264:13: note: previous declaration is here
-extern bool config_enum_lookup_by_name(struct config_enum * record,
-            ^
-fatal error: too many errors emitted, stopping now [-ferror-limit=]
-
---- src/backend/commands/dbcommands.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/commands/dbcommands.c
-@@ -19,6 +19,7 @@
-  */
- #include "postgres.h"
- 
-+#include <stdbool.h>
- #include <fcntl.h>
- #include <locale.h>
- #include <unistd.h>
---- src/backend/optimizer/path/indxpath.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/optimizer/path/indxpath.c
-@@ -15,6 +15,7 @@
-  */
- #include "postgres.h"
- 
-+#include <stdbool.h>
- #include <math.h>
- 
- #include "access/stratnum.h"
---- src/backend/tsearch/regis.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/tsearch/regis.c
-@@ -14,6 +14,8 @@
- 
- #include "postgres.h"
- 
-+#include <stdbool.h>
-+
- #include "tsearch/dicts/regis.h"
- #include "tsearch/ts_locale.h"
- 
---- src/backend/utils/adt/levenshtein.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/utils/adt/levenshtein.c
-@@ -23,6 +23,8 @@
-  *
-  *-------------------------------------------------------------------------
-  */
-+#include <stdbool.h>
-+
- #define MAX_LEVENSHTEIN_STRLEN		255
- 
- /*
---- src/backend/utils/adt/varlena.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/utils/adt/varlena.c
-@@ -14,6 +14,7 @@
-  */
- #include "postgres.h"
- 
-+#include <stdbool.h>
- #include <ctype.h>
- #include <limits.h>
- 
---- src/backend/utils/misc/guc.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/utils/misc/guc.c
-@@ -16,6 +16,7 @@
-  */
- #include "postgres.h"
- 
-+#include <stdbool.h>
- #include <ctype.h>
- #include <float.h>
- #include <math.h>
diff --git a/databases/postgresql96-server/files/patch-src-Makefile.shlib b/databases/postgresql96-server/files/patch-src-Makefile.shlib
deleted file mode 100644
index 2435ffe1d280..000000000000
--- a/databases/postgresql96-server/files/patch-src-Makefile.shlib
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.shlib.bak	2013-05-06 22:57:06.000000000 +0200
-+++ src/Makefile.shlib	2013-05-12 23:33:16.000000000 +0200
-@@ -87,7 +87,7 @@
- # Testing the soname variable is a reliable way to determine whether a
- # linkable library is being built.
- soname		= $(shlib_major)
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- else
- # Naming convention for dynamically loadable modules
- shlib		= $(NAME)$(DLSUFFIX)
diff --git a/databases/postgresql96-server/files/patch-src-backend-Makefile b/databases/postgresql96-server/files/patch-src-backend-Makefile
deleted file mode 100644
index d44406c3edd4..000000000000
--- a/databases/postgresql96-server/files/patch-src-backend-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/backend/Makefile.orig	2009-07-07 15:58:33.000000000 +0200
-+++ src/backend/Makefile	2009-07-07 15:58:57.000000000 +0200
-@@ -107,6 +107,8 @@
- # Update the commonly used headers before building the subdirectories
- $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
- 
-+symlinks: $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h $(top_builddir)/src/include/storage/lwlocknames.h
-+
- 
- # The postgres.o target is needed by the rule in Makefile.global that
- # creates the exports file when MAKE_EXPORTS = true.
diff --git a/databases/postgresql96-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql96-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
deleted file mode 100644
index a82826b3b5f1..000000000000
--- a/databases/postgresql96-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
-+++ src/backend/utils/misc/postgresql.conf.sample
-@@ -330,6 +330,7 @@
- 
- # - Where to Log -
- 
-+log_destination = 'syslog'
- #log_destination = 'stderr'		# Valid values are combinations of
- 					# stderr, csvlog, syslog, and eventlog,
- 					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql96-server/files/pkg-message-client.in b/databases/postgresql96-server/files/pkg-message-client.in
deleted file mode 100644
index 404124204b7d..000000000000
--- a/databases/postgresql96-server/files/pkg-message-client.in
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-The PostgreSQL port has a collection of "side orders":
-
-postgresql-docs
-  For all of the html documentation
-
-p5-Pg
-  A perl5 API for client access to PostgreSQL databases.
-
-postgresql-tcltk 
-  If you want tcl/tk client support.
-
-postgresql-jdbc
-  For Java JDBC support.
-
-postgresql-odbc
-  For client access from unix applications using ODBC as access
-  method. Not needed to access unix PostgreSQL servers from Win32
-  using ODBC. See below.
-
-ruby-postgres, py-psycopg2
-  For client access to PostgreSQL databases using the ruby & python
-  languages.
-
-postgresql-plperl, postgresql-pltcl & postgresql-plruby
-  For using perl5, tcl & ruby as procedural languages.
-
-postgresql-contrib
-  Lots of contributed utilities, postgresql functions and
-  datatypes. There you find pg_standby, pgcrypto and many other cool
-  things.
-
-etc...
-EOM
-}
-]
diff --git a/databases/postgresql96-server/files/pkg-message-contrib.in b/databases/postgresql96-server/files/pkg-message-contrib.in
deleted file mode 100644
index 2d9f3d86e71c..000000000000
--- a/databases/postgresql96-server/files/pkg-message-contrib.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-The PostgreSQL contrib utilities have been installed. Please see
-%%PREFIX%%/share/doc/postgresql/contrib/README
-for more information.
-EOM
-}
-]
diff --git a/databases/postgresql96-server/files/pkg-message-plperl.in b/databases/postgresql96-server/files/pkg-message-plperl.in
deleted file mode 100644
index dbda7daff5c2..000000000000
--- a/databases/postgresql96-server/files/pkg-message-plperl.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-PL/Perl has been installed. Check the createlang(l) manpage for more
-info. You can install PL/Perl as trusted or untrusted, by using either
-"createlang plperl" or "createlang plperlu".
-EOM
-}
-]
diff --git a/databases/postgresql96-server/files/pkg-message-plpython.in b/databases/postgresql96-server/files/pkg-message-plpython.in
deleted file mode 100644
index 3bd80d73d177..000000000000
--- a/databases/postgresql96-server/files/pkg-message-plpython.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-PL/Python has been installed. Check the createlang(l) manpage for more
-info. You can install PL/Python by using "createlang plpythonu" (it
-exists as an untrusted language only).
-EOM
-}
-]
diff --git a/databases/postgresql96-server/files/pkg-message-pltcl.in b/databases/postgresql96-server/files/pkg-message-pltcl.in
deleted file mode 100644
index c1776f7d6fb3..000000000000
--- a/databases/postgresql96-server/files/pkg-message-pltcl.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-PL/Tcl has been  installed. Check the createlang(l) manpage for more
-info. You can install pltcl as trusted or untrusted, by using either
-"createlang pltcl" or "createlang pltclu".
*** 2450 LINES SKIPPED ***