git: a44429355e8c - main - Mk: unregister expired PostgreSQL 9.6

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

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

commit a44429355e8c100e28806858d7fea0ee2b2d44ba
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2022-03-11 11:30:54 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2022-03-11 11:30:54 +0000

    Mk: unregister expired PostgreSQL 9.6
    
    Update an IGNORE message, leave examples at the top of pgsql.mk
    alone for now.
---
 Mk/Uses/pgsql.mk           | 4 ++--
 Mk/bsd.default-versions.mk | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
index cb04222245f2..27132d825267 100644
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -39,7 +39,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.6 10 11 12 13 14
+VALID_PGSQL_VER=	10 11 12 13 14
 
 # Override non-default LIBVERS like this:
 #PGSQL99_LIBVER=6
@@ -63,7 +63,7 @@ PGSQL_DEFAULT?=	${$w_PGSQL_VER:C,^.,&.,}
 .  endfor
 
 .  ifdef DEFAULT_PGSQL_VER && WITH_PGSQL_VER
-IGNORE=		will not allow setting both DEFAULT_PGSQL_VER and WITH_PGSQL_VER.  Use DEFAULT_VERSIONS=pgsql=9.6 instead
+IGNORE=		will not allow setting both DEFAULT_PGSQL_VER and WITH_PGSQL_VER.  Use DEFAULT_VERSIONS=pgsql=13 instead
 .  endif
 
 # Setting/finding PostgreSQL version we want.
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 985c723f6936..c4a56a4337ac 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -105,7 +105,7 @@ _PERL5_FROM_BIN!=	${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;'
 _EXPORTED_VARS+=	_PERL5_FROM_BIN
 PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
 .endif
-# Possible values: 9.6, 10, 11, 12, 13, 14
+# Possible values: 10, 11, 12, 13, 14
 PGSQL_DEFAULT?=		13
 # Possible values: 7.4, 8.0, 8.1
 PHP_DEFAULT?=		8.0