From nobody Fri Mar 11 11:32:50 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 856AE19FBEB7; Fri, 11 Mar 2022 11:32:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KFP1Z6xmNz3CJ4; Fri, 11 Mar 2022 11:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646998371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tfbm8m85mbTdoVWQuCjp1ho48REu9iV/fVkTt0YWHnQ=; b=MCRIbaHMPCEGSx/GsVgiyKafZ8Eq/hgUxLF8lEgdGuQH0SlqPWnxrLgHl94vXxPP/H59ih uNPlFdk9DANFXeh/6RWETQT1kzK+fbgGO+hRXSPi90l4RDxhU1X2TwEDtkN65w0Kj2FmrM hctyEV24aSO4MCO2I6vbU13oMuhKirN3q9ilkNDuzzVNrUQ1QaO5grYbs6OgeUBM3pA8/P rCN/HvGgN87uL5kgSEemyyz2G57W90rl/Whkay6zniZog5q1F8Ry2MjW4p0n2cyDm20aTG fZLM/sFSfCqZxo5NSKMjmPqONcxF3koWJyuMJkqnx7YdNXDkAghf7Yn7wiDoEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CBE9518A18; Fri, 11 Mar 2022 11:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22BBWoLW081592; Fri, 11 Mar 2022 11:32:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22BBWoOU081591; Fri, 11 Mar 2022 11:32:50 GMT (envelope-from git) Date: Fri, 11 Mar 2022 11:32:50 GMT Message-Id: <202203111132.22BBWoOU081591@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: a44429355e8c - main - Mk: unregister expired PostgreSQL 9.6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a44429355e8c100e28806858d7fea0ee2b2d44ba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646998371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tfbm8m85mbTdoVWQuCjp1ho48REu9iV/fVkTt0YWHnQ=; b=mGny6TWjHycrBZe1yFKGCjnlGjDqD3/s+gcvPVImGYdnNaddgEzM7h8sW+AbsM/tzDApoq mAvjG5Bwqam6oWi7eLwjvCq/3XQw68C1Ufb4niJ1IB4dM1Z6hlDbfYztjHtbi8HyVD9sqS IDvBDAiDNAOG7vGfEjvBWcxwrmc0SbUIe9fCAWddW/BYlhuWEfaLNVOrBxfPD69PXPVa+Y 5w23wo+EwptQCf8oV1Em6JDXVZ8dtbgzSFeUbpfRGhFxrhlPkQffYyupacty5doEHfmPlH Z6lJzqvQ2EP2mQTWaQTHgsCmVOIwl8XgTFhE/joBgaF1M0NHAbMH/f60+Cbfvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646998371; a=rsa-sha256; cv=none; b=FDOMXgsn94EUTybZRRnXRN3g2iHONjioqLKhUdk+YowOHtM9vukFG95a3KDteI5TBY5qEo JOnh2psYlTcF0nbuA59K07LgZ75C8xB/3oSfnuSbLO/uaOD8I0EGBUO4P1Mke0ua0906Ep q3jjHmC7A0WDMZOjBPL6iCQjubkQwDdeyI+4kMURJaJ8zByIrqQcfeiQRI7JKDmDiAGr/v eJLxXeKinnFVGK+TuQcm+7aGuEqQqsWZU02TB2GcbSmgnwv9kFXdMQrh8SnwCoZ6Y0HXCL Ximjw4jmsHoe5z3HAJpoWngfWFf4FvVMBmrtMMWB4EF46KFS86LH3No2CWkmtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=a44429355e8c100e28806858d7fea0ee2b2d44ba commit a44429355e8c100e28806858d7fea0ee2b2d44ba Author: Rene Ladan AuthorDate: 2022-03-11 11:30:54 +0000 Commit: Rene Ladan 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