git: a626924cf25a - main - databases/postgresql{13,14,15,16,17,18}-*: Multiple fixes
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 05 Nov 2025 10:24:26 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a626924cf25a85f7554c10b63dcf61f36d948016
commit a626924cf25a85f7554c10b63dcf61f36d948016
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-11-05 10:18:38 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-11-05 10:23:43 +0000
databases/postgresql{13,14,15,16,17,18}-*: Multiple fixes
- Strip shared library and binary executable
- Fix stage-qa
- Bump PORTREVISION for package change
postgresql{13,14,15,16,17,18}-server:
- Clean up Makefile: Remove unnecessary ";\"
- Sort PLIST: share/locale comes before DATADIR (share/postgresql)
postgresql{17,18}-plperl:
- Remove duplicate USES=perl5
- Add missing USE_PERL5=run
from postgresql{17,18}-plperl build log:
====> Running Q/A tests (stage-qa)
Error: /usr/local/lib/postgresql/bool_plperl.so is linked to /usr/local/lib/perl5/5.40/mach/CORE/libperl.so.5.40 from lang/perl5.40 but it is not declared as a dependency
PR: 290587
Approved by: girgen
---
databases/postgresql13-client/Makefile | 2 +-
databases/postgresql13-contrib/Makefile | 2 +-
databases/postgresql13-plperl/Makefile | 2 +-
databases/postgresql13-plpython/Makefile | 2 +-
databases/postgresql13-pltcl/Makefile | 2 +-
databases/postgresql13-server/Makefile | 2 +-
databases/postgresql13-server/pkg-plist-server | 22 ++++++++++----------
databases/postgresql14-client/Makefile | 2 +-
databases/postgresql14-contrib/Makefile | 2 +-
databases/postgresql14-plperl/Makefile | 2 +-
databases/postgresql14-plpython/Makefile | 2 +-
databases/postgresql14-pltcl/Makefile | 2 +-
databases/postgresql14-server/Makefile | 2 +-
databases/postgresql14-server/pkg-plist-server | 28 +++++++++++++-------------
databases/postgresql15-client/Makefile | 2 +-
databases/postgresql15-contrib/Makefile | 2 +-
databases/postgresql15-plperl/Makefile | 2 +-
databases/postgresql15-plpython/Makefile | 2 +-
databases/postgresql15-pltcl/Makefile | 2 +-
databases/postgresql15-server/Makefile | 2 +-
databases/postgresql15-server/pkg-plist-server | 28 +++++++++++++-------------
databases/postgresql16-client/Makefile | 2 +-
databases/postgresql16-contrib/Makefile | 2 +-
databases/postgresql16-plperl/Makefile | 2 +-
databases/postgresql16-plpython/Makefile | 2 +-
databases/postgresql16-pltcl/Makefile | 2 +-
databases/postgresql16-server/Makefile | 2 +-
databases/postgresql16-server/pkg-plist-server | 28 +++++++++++++-------------
databases/postgresql17-client/Makefile | 2 +-
databases/postgresql17-contrib/Makefile | 2 +-
databases/postgresql17-plperl/Makefile | 5 +++--
databases/postgresql17-plpython/Makefile | 2 +-
databases/postgresql17-pltcl/Makefile | 2 +-
databases/postgresql17-server/Makefile | 2 +-
databases/postgresql17-server/pkg-plist-server | 22 ++++++++++----------
databases/postgresql18-client/Makefile | 2 +-
databases/postgresql18-contrib/Makefile | 2 +-
databases/postgresql18-plperl/Makefile | 5 +++--
databases/postgresql18-plpython/Makefile | 2 +-
databases/postgresql18-pltcl/Makefile | 2 +-
databases/postgresql18-server/Makefile | 21 +++++++++++--------
databases/postgresql18-server/pkg-plist-server | 22 ++++++++++----------
42 files changed, 127 insertions(+), 120 deletions(-)
diff --git a/databases/postgresql13-client/Makefile b/databases/postgresql13-client/Makefile
index 97954ecc578d..4c695aa79113 100644
--- a/databases/postgresql13-client/Makefile
+++ b/databases/postgresql13-client/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql13-contrib/Makefile b/databases/postgresql13-contrib/Makefile
index ad8a568951ee..7bac5c915b90 100644
--- a/databases/postgresql13-contrib/Makefile
+++ b/databases/postgresql13-contrib/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql13-plperl/Makefile b/databases/postgresql13-plperl/Makefile
index 24f81e37fd45..e9e62865c07b 100644
--- a/databases/postgresql13-plperl/Makefile
+++ b/databases/postgresql13-plperl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases perl5
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
diff --git a/databases/postgresql13-plpython/Makefile b/databases/postgresql13-plpython/Makefile
index d5ea59e84622..ae0a17b2ade0 100644
--- a/databases/postgresql13-plpython/Makefile
+++ b/databases/postgresql13-plpython/Makefile
@@ -1,7 +1,7 @@
PORTNAME= postgresql
CATEGORIES= databases python
# Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql13-pltcl/Makefile b/databases/postgresql13-pltcl/Makefile
index 82e49bd5554f..ff44a92f86f4 100644
--- a/databases/postgresql13-pltcl/Makefile
+++ b/databases/postgresql13-pltcl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases tcl
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index 07b2113be886..4838ad638e1a 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -1,7 +1,7 @@
DISTVERSION?= 13.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
+PORTREVISION?= 1
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql13-server/pkg-plist-server b/databases/postgresql13-server/pkg-plist-server
index d33aaa30b518..9cb369d738eb 100644
--- a/databases/postgresql13-server/pkg-plist-server
+++ b/databases/postgresql13-server/pkg-plist-server
@@ -726,17 +726,6 @@ lib/postgresql/utf8_and_win.so
%%LLVM%%lib/postgresql/llvmjit.so
%%LLVM%%lib/postgresql/llvmjit_types.bc
%%PORTDOCS%%%%DOCSDIR%%/README-server
-%%DATADIR%%/errcodes.txt
-%%DATADIR%%/extension/plpgsql--1.0.sql
-%%DATADIR%%/extension/plpgsql.control
-%%DATADIR%%/information_schema.sql
-%%DATADIR%%/pg_hba.conf.sample
-%%DATADIR%%/pg_ident.conf.sample
-%%DATADIR%%/postgres.bki
-%%DATADIR%%/postgresql.conf.sample
-%%DATADIR%%/snowball_create.sql
-%%DATADIR%%/sql_features.txt
-%%DATADIR%%/system_views.sql
%%NLS%%share/locale/cs/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
@@ -909,6 +898,17 @@ lib/postgresql/utf8_and_win.so
%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%DATADIR%%/errcodes.txt
+%%DATADIR%%/extension/plpgsql--1.0.sql
+%%DATADIR%%/extension/plpgsql.control
+%%DATADIR%%/information_schema.sql
+%%DATADIR%%/pg_hba.conf.sample
+%%DATADIR%%/pg_ident.conf.sample
+%%DATADIR%%/postgres.bki
+%%DATADIR%%/postgresql.conf.sample
+%%DATADIR%%/snowball_create.sql
+%%DATADIR%%/sql_features.txt
+%%DATADIR%%/system_views.sql
%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
diff --git a/databases/postgresql14-client/Makefile b/databases/postgresql14-client/Makefile
index 6a13eea98e23..11359088451d 100644
--- a/databases/postgresql14-client/Makefile
+++ b/databases/postgresql14-client/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql14-contrib/Makefile b/databases/postgresql14-contrib/Makefile
index e60bf88b53b4..cc49bb514af0 100644
--- a/databases/postgresql14-contrib/Makefile
+++ b/databases/postgresql14-contrib/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 0
+REVISION= 1
CATEGORIES= databases
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql14-plperl/Makefile b/databases/postgresql14-plperl/Makefile
index 3cb6e894c99e..64558c042265 100644
--- a/databases/postgresql14-plperl/Makefile
+++ b/databases/postgresql14-plperl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases perl5
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
diff --git a/databases/postgresql14-plpython/Makefile b/databases/postgresql14-plpython/Makefile
index 47c468226bdc..26645c55192b 100644
--- a/databases/postgresql14-plpython/Makefile
+++ b/databases/postgresql14-plpython/Makefile
@@ -1,7 +1,7 @@
PORTNAME= postgresql
CATEGORIES= databases python
# Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql14-pltcl/Makefile b/databases/postgresql14-pltcl/Makefile
index d7468f28f0ca..44b3c1cf1bfb 100644
--- a/databases/postgresql14-pltcl/Makefile
+++ b/databases/postgresql14-pltcl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases tcl
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile
index 0b7b0fbea429..be5159ecde20 100644
--- a/databases/postgresql14-server/Makefile
+++ b/databases/postgresql14-server/Makefile
@@ -1,7 +1,7 @@
DISTVERSION?= 14.19
# 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
+PORTREVISION?= 1
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql14-server/pkg-plist-server b/databases/postgresql14-server/pkg-plist-server
index 254729c73cdc..9d2b6596360a 100644
--- a/databases/postgresql14-server/pkg-plist-server
+++ b/databases/postgresql14-server/pkg-plist-server
@@ -747,20 +747,6 @@ lib/postgresql/utf8_and_win.so
%%LLVM%%lib/postgresql/llvmjit.so
%%LLVM%%lib/postgresql/llvmjit_types.bc
%%PORTDOCS%%%%DOCSDIR%%/README-server
-%%DATADIR%%/errcodes.txt
-%%DATADIR%%/extension/plpgsql--1.0.sql
-%%DATADIR%%/extension/plpgsql.control
-%%DATADIR%%/fix-CVE-2024-4317.sql
-%%DATADIR%%/information_schema.sql
-%%DATADIR%%/pg_hba.conf.sample
-%%DATADIR%%/pg_ident.conf.sample
-%%DATADIR%%/postgres.bki
-%%DATADIR%%/postgresql.conf.sample
-%%DATADIR%%/snowball_create.sql
-%%DATADIR%%/sql_features.txt
-%%DATADIR%%/system_constraints.sql
-%%DATADIR%%/system_functions.sql
-%%DATADIR%%/system_views.sql
%%NLS%%share/locale/cs/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
@@ -929,6 +915,20 @@ lib/postgresql/utf8_and_win.so
%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%DATADIR%%/errcodes.txt
+%%DATADIR%%/extension/plpgsql--1.0.sql
+%%DATADIR%%/extension/plpgsql.control
+%%DATADIR%%/fix-CVE-2024-4317.sql
+%%DATADIR%%/information_schema.sql
+%%DATADIR%%/pg_hba.conf.sample
+%%DATADIR%%/pg_ident.conf.sample
+%%DATADIR%%/postgres.bki
+%%DATADIR%%/postgresql.conf.sample
+%%DATADIR%%/snowball_create.sql
+%%DATADIR%%/sql_features.txt
+%%DATADIR%%/system_constraints.sql
+%%DATADIR%%/system_functions.sql
+%%DATADIR%%/system_views.sql
%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
diff --git a/databases/postgresql15-client/Makefile b/databases/postgresql15-client/Makefile
index 14e24a618064..85ecd23d2055 100644
--- a/databases/postgresql15-client/Makefile
+++ b/databases/postgresql15-client/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql15-contrib/Makefile b/databases/postgresql15-contrib/Makefile
index 8d8803e14f03..029971d32399 100644
--- a/databases/postgresql15-contrib/Makefile
+++ b/databases/postgresql15-contrib/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql15-plperl/Makefile b/databases/postgresql15-plperl/Makefile
index 996289b0b187..9460a1e7b67c 100644
--- a/databases/postgresql15-plperl/Makefile
+++ b/databases/postgresql15-plperl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases perl5
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
diff --git a/databases/postgresql15-plpython/Makefile b/databases/postgresql15-plpython/Makefile
index 5545b860c18b..c390f7bed4aa 100644
--- a/databases/postgresql15-plpython/Makefile
+++ b/databases/postgresql15-plpython/Makefile
@@ -1,7 +1,7 @@
PORTNAME= postgresql
CATEGORIES= databases python
# Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql15-pltcl/Makefile b/databases/postgresql15-pltcl/Makefile
index 497032f0d07b..3da7763ea7d8 100644
--- a/databases/postgresql15-pltcl/Makefile
+++ b/databases/postgresql15-pltcl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases tcl
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile
index e950d4e41615..067bf02d2ac5 100644
--- a/databases/postgresql15-server/Makefile
+++ b/databases/postgresql15-server/Makefile
@@ -1,7 +1,7 @@
DISTVERSION?= 15.14
# 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
+PORTREVISION?= 1
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql15-server/pkg-plist-server b/databases/postgresql15-server/pkg-plist-server
index 4ada93678b40..5ee089a14242 100644
--- a/databases/postgresql15-server/pkg-plist-server
+++ b/databases/postgresql15-server/pkg-plist-server
@@ -783,20 +783,6 @@ lib/postgresql/utf8_and_win.so
%%LLVM%%lib/postgresql/llvmjit.so
%%LLVM%%lib/postgresql/llvmjit_types.bc
%%PORTDOCS%%%%DOCSDIR%%/README-server
-%%DATADIR%%/errcodes.txt
-%%DATADIR%%/extension/plpgsql--1.0.sql
-%%DATADIR%%/extension/plpgsql.control
-%%DATADIR%%/fix-CVE-2024-4317.sql
-%%DATADIR%%/information_schema.sql
-%%DATADIR%%/pg_hba.conf.sample
-%%DATADIR%%/pg_ident.conf.sample
-%%DATADIR%%/postgres.bki
-%%DATADIR%%/postgresql.conf.sample
-%%DATADIR%%/snowball_create.sql
-%%DATADIR%%/sql_features.txt
-%%DATADIR%%/system_constraints.sql
-%%DATADIR%%/system_functions.sql
-%%DATADIR%%/system_views.sql
%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
@@ -980,6 +966,20 @@ lib/postgresql/utf8_and_win.so
%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%DATADIR%%/errcodes.txt
+%%DATADIR%%/extension/plpgsql--1.0.sql
+%%DATADIR%%/extension/plpgsql.control
+%%DATADIR%%/fix-CVE-2024-4317.sql
+%%DATADIR%%/information_schema.sql
+%%DATADIR%%/pg_hba.conf.sample
+%%DATADIR%%/pg_ident.conf.sample
+%%DATADIR%%/postgres.bki
+%%DATADIR%%/postgresql.conf.sample
+%%DATADIR%%/snowball_create.sql
+%%DATADIR%%/sql_features.txt
+%%DATADIR%%/system_constraints.sql
+%%DATADIR%%/system_functions.sql
+%%DATADIR%%/system_views.sql
%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
diff --git a/databases/postgresql16-client/Makefile b/databases/postgresql16-client/Makefile
index 536d313cbdb4..e258a7b3e917 100644
--- a/databases/postgresql16-client/Makefile
+++ b/databases/postgresql16-client/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql16-contrib/Makefile b/databases/postgresql16-contrib/Makefile
index cd8376580200..e68f712cb309 100644
--- a/databases/postgresql16-contrib/Makefile
+++ b/databases/postgresql16-contrib/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql16-plperl/Makefile b/databases/postgresql16-plperl/Makefile
index 11fb616ea16c..16021221c1e7 100644
--- a/databases/postgresql16-plperl/Makefile
+++ b/databases/postgresql16-plperl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases perl5
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
diff --git a/databases/postgresql16-plpython/Makefile b/databases/postgresql16-plpython/Makefile
index 5f68bc60a927..4b9d332abe96 100644
--- a/databases/postgresql16-plpython/Makefile
+++ b/databases/postgresql16-plpython/Makefile
@@ -1,7 +1,7 @@
PORTNAME= postgresql
CATEGORIES= databases python
# Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql16-pltcl/Makefile b/databases/postgresql16-pltcl/Makefile
index e0c84196b3c5..6356c01ad4b9 100644
--- a/databases/postgresql16-pltcl/Makefile
+++ b/databases/postgresql16-pltcl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases tcl
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile
index d4c26262a6b7..cb5615f293de 100644
--- a/databases/postgresql16-server/Makefile
+++ b/databases/postgresql16-server/Makefile
@@ -1,7 +1,7 @@
DISTVERSION?= 16.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?= 0
+PORTREVISION?= 1
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql16-server/pkg-plist-server b/databases/postgresql16-server/pkg-plist-server
index 5b0e19ba98aa..7e51c36a7699 100644
--- a/databases/postgresql16-server/pkg-plist-server
+++ b/databases/postgresql16-server/pkg-plist-server
@@ -797,20 +797,6 @@ lib/postgresql/utf8_and_win.so
%%LLVM%%lib/postgresql/llvmjit.so
%%LLVM%%lib/postgresql/llvmjit_types.bc
%%PORTDOCS%%%%DOCSDIR%%/README-server
-%%DATADIR%%/errcodes.txt
-%%DATADIR%%/extension/plpgsql--1.0.sql
-%%DATADIR%%/extension/plpgsql.control
-%%DATADIR%%/fix-CVE-2024-4317.sql
-%%DATADIR%%/information_schema.sql
-%%DATADIR%%/pg_hba.conf.sample
-%%DATADIR%%/pg_ident.conf.sample
-%%DATADIR%%/postgres.bki
-%%DATADIR%%/postgresql.conf.sample
-%%DATADIR%%/snowball_create.sql
-%%DATADIR%%/sql_features.txt
-%%DATADIR%%/system_constraints.sql
-%%DATADIR%%/system_functions.sql
-%%DATADIR%%/system_views.sql
%%NLS%%share/locale/cs/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
@@ -1052,6 +1038,20 @@ lib/postgresql/utf8_and_win.so
%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%DATADIR%%/errcodes.txt
+%%DATADIR%%/extension/plpgsql--1.0.sql
+%%DATADIR%%/extension/plpgsql.control
+%%DATADIR%%/fix-CVE-2024-4317.sql
+%%DATADIR%%/information_schema.sql
+%%DATADIR%%/pg_hba.conf.sample
+%%DATADIR%%/pg_ident.conf.sample
+%%DATADIR%%/postgres.bki
+%%DATADIR%%/postgresql.conf.sample
+%%DATADIR%%/snowball_create.sql
+%%DATADIR%%/sql_features.txt
+%%DATADIR%%/system_constraints.sql
+%%DATADIR%%/system_functions.sql
+%%DATADIR%%/system_views.sql
%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
diff --git a/databases/postgresql17-client/Makefile b/databases/postgresql17-client/Makefile
index e1fab8026513..9b287fddba31 100644
--- a/databases/postgresql17-client/Makefile
+++ b/databases/postgresql17-client/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql17-contrib/Makefile b/databases/postgresql17-contrib/Makefile
index 1a55a4cc9a46..001c798933c8 100644
--- a/databases/postgresql17-contrib/Makefile
+++ b/databases/postgresql17-contrib/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql17-plperl/Makefile b/databases/postgresql17-plperl/Makefile
index 3b95d6355e3b..3e4936e25dae 100644
--- a/databases/postgresql17-plperl/Makefile
+++ b/databases/postgresql17-plperl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases perl5
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
@@ -13,7 +13,8 @@ MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
WANT_PGSQL_VER?=17
-USES+= perl5 readline
+USES= readline
+USE_PERL5= run
CONFIGURE_ARGS= --with-perl
BUILD_DIRS= src/backend ${INSTALL_DIRS}
diff --git a/databases/postgresql17-plpython/Makefile b/databases/postgresql17-plpython/Makefile
index 6fc9a43b1551..de572c2ab87e 100644
--- a/databases/postgresql17-plpython/Makefile
+++ b/databases/postgresql17-plpython/Makefile
@@ -1,7 +1,7 @@
PORTNAME= postgresql
CATEGORIES= databases python
# Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql17-pltcl/Makefile b/databases/postgresql17-pltcl/Makefile
index 7759f6045000..8a52fd957a34 100644
--- a/databases/postgresql17-pltcl/Makefile
+++ b/databases/postgresql17-pltcl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases tcl
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
diff --git a/databases/postgresql17-server/Makefile b/databases/postgresql17-server/Makefile
index 6bd13e163497..0572a7f459de 100644
--- a/databases/postgresql17-server/Makefile
+++ b/databases/postgresql17-server/Makefile
@@ -1,7 +1,7 @@
DISTVERSION?= 17.6
# 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
+PORTREVISION?= 1
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql17-server/pkg-plist-server b/databases/postgresql17-server/pkg-plist-server
index fc8fabc8df4f..5752ed752f4d 100644
--- a/databases/postgresql17-server/pkg-plist-server
+++ b/databases/postgresql17-server/pkg-plist-server
@@ -815,17 +815,6 @@ lib/postgresql/utf8_and_win.so
%%LLVM%%lib/postgresql/llvmjit.so
%%LLVM%%lib/postgresql/llvmjit_types.bc
%%PORTDOCS%%%%DOCSDIR%%/README-server
-%%DATADIR%%/errcodes.txt
-%%DATADIR%%/extension/plpgsql--1.0.sql
-%%DATADIR%%/extension/plpgsql.control
-%%DATADIR%%/information_schema.sql
-%%DATADIR%%/pg_hba.conf.sample
-%%DATADIR%%/pg_ident.conf.sample
-%%DATADIR%%/postgresql.conf.sample
-%%DATADIR%%/snowball_create.sql
-%%DATADIR%%/sql_features.txt
-%%DATADIR%%/system_functions.sql
-%%DATADIR%%/system_views.sql
%%NLS%%share/locale/cs/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
@@ -1081,6 +1070,17 @@ lib/postgresql/utf8_and_win.so
%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%DATADIR%%/errcodes.txt
+%%DATADIR%%/extension/plpgsql--1.0.sql
+%%DATADIR%%/extension/plpgsql.control
+%%DATADIR%%/information_schema.sql
+%%DATADIR%%/pg_hba.conf.sample
+%%DATADIR%%/pg_ident.conf.sample
+%%DATADIR%%/postgresql.conf.sample
+%%DATADIR%%/snowball_create.sql
+%%DATADIR%%/sql_features.txt
+%%DATADIR%%/system_functions.sql
+%%DATADIR%%/system_views.sql
%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
diff --git a/databases/postgresql18-client/Makefile b/databases/postgresql18-client/Makefile
index a8997543b326..5dabf9060252 100644
--- a/databases/postgresql18-client/Makefile
+++ b/databases/postgresql18-client/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 0
+PORTREVISION= 1
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql18-contrib/Makefile b/databases/postgresql18-contrib/Makefile
index 9a73e8733994..63ab398118a1 100644
--- a/databases/postgresql18-contrib/Makefile
+++ b/databases/postgresql18-contrib/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postgresql
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql18-plperl/Makefile b/databases/postgresql18-plperl/Makefile
index 560a63c9da09..e9b808311720 100644
--- a/databases/postgresql18-plperl/Makefile
+++ b/databases/postgresql18-plperl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases perl5
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
@@ -13,7 +13,8 @@ MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
WANT_PGSQL_VER?=18
-USES+= perl5 readline
+USES= readline
+USE_PERL5= run
CONFIGURE_ARGS= --with-perl
BUILD_DIRS= src/backend ${INSTALL_DIRS}
diff --git a/databases/postgresql18-plpython/Makefile b/databases/postgresql18-plpython/Makefile
index 435c54cdbc2e..0dcbdb2a2693 100644
--- a/databases/postgresql18-plpython/Makefile
+++ b/databases/postgresql18-plpython/Makefile
@@ -1,7 +1,7 @@
PORTNAME= postgresql
CATEGORIES= databases python
# Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
diff --git a/databases/postgresql18-pltcl/Makefile b/databases/postgresql18-pltcl/Makefile
index 3510c70c4ec6..e80188aed588 100644
--- a/databases/postgresql18-pltcl/Makefile
+++ b/databases/postgresql18-pltcl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgresql
# Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases tcl
PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT}
diff --git a/databases/postgresql18-server/Makefile b/databases/postgresql18-server/Makefile
index 8d3202ae3cdb..7b5bcf107120 100644
--- a/databases/postgresql18-server/Makefile
+++ b/databases/postgresql18-server/Makefile
@@ -2,7 +2,7 @@ PORTNAME?= postgresql
DISTVERSION?= 18.0
# 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
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= PGSQL/source/v${DISTVERSION}
PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
@@ -24,7 +24,7 @@ PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT}
USES+= tar:bzip2 cpe
.if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 17
USES+= bison perl5
-USE_PERL5= build
+USE_PERL5+= build
.endif
.if !defined(NO_BUILD)
@@ -219,23 +219,28 @@ post-patch:
. endif
do-install:
- @for dir in ${INSTALL_DIRS}; do \
+ for dir in ${INSTALL_DIRS}; do \
cd ${WRKSRC}/$${dir} && \
${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \
done
. if defined(SERVER_ONLY)
- @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\
- ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
+ ${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 && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/lib*.so
+ cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
. if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 17
- @ cd ${WRKSRC}/doc/src/sgml && ${COPYTREE_SHARE} "man1 man3 man7" ${STAGEDIR}${PREFIX}/share/man
+ cd ${WRKSRC}/doc/src/sgml && ${COPYTREE_SHARE} "man1 man3 man7" ${STAGEDIR}${PREFIX}/share/man
. endif
. endif
- @ if [ -r ${PKGMESSAGE} ]; then \
+. if defined(SLAVE_ONLY)
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
+. endif
+ if [ -r ${PKGMESSAGE} ]; then \
${MKDIR} ${STAGEDIR}${DOCSDIR} ;\
${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\
fi
diff --git a/databases/postgresql18-server/pkg-plist-server b/databases/postgresql18-server/pkg-plist-server
index 4cb29081b15a..258ce70bfd40 100644
--- a/databases/postgresql18-server/pkg-plist-server
+++ b/databases/postgresql18-server/pkg-plist-server
@@ -842,17 +842,6 @@ lib/postgresql/utf8_and_win.so
%%LLVM%%lib/postgresql/llvmjit.so
%%LLVM%%lib/postgresql/llvmjit_types.bc
%%PORTDOCS%%%%DOCSDIR%%/README-server
-%%DATADIR%%/errcodes.txt
-%%DATADIR%%/extension/plpgsql--1.0.sql
-%%DATADIR%%/extension/plpgsql.control
-%%DATADIR%%/information_schema.sql
-%%DATADIR%%/pg_hba.conf.sample
-%%DATADIR%%/pg_ident.conf.sample
-%%DATADIR%%/postgresql.conf.sample
-%%DATADIR%%/snowball_create.sql
-%%DATADIR%%/sql_features.txt
-%%DATADIR%%/system_functions.sql
-%%DATADIR%%/system_views.sql
%%NLS%%share/locale/cs/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
@@ -1108,6 +1097,17 @@ lib/postgresql/utf8_and_win.so
%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%DATADIR%%/errcodes.txt
+%%DATADIR%%/extension/plpgsql--1.0.sql
+%%DATADIR%%/extension/plpgsql.control
+%%DATADIR%%/information_schema.sql
+%%DATADIR%%/pg_hba.conf.sample
+%%DATADIR%%/pg_ident.conf.sample
+%%DATADIR%%/postgresql.conf.sample
+%%DATADIR%%/snowball_create.sql
+%%DATADIR%%/sql_features.txt
+%%DATADIR%%/system_functions.sql
+%%DATADIR%%/system_views.sql
%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa