From 585adf391b886f17b2e2508d0008927702147bac Mon Sep 17 00:00:00 2001 From: Palle Girgensohn Date: Sun, 14 Jan 2024 11:00:18 +0100 Subject: postgresql??-server: fix rc script bug when using profiles Submitted by: John W. O'Brien --- databases/postgresql12-server/Makefile | 2 +- databases/postgresql12-server/files/postgresql.in | 2 +- databases/postgresql13-server/Makefile | 2 +- databases/postgresql13-server/files/postgresql.in | 2 +- databases/postgresql14-server/Makefile | 2 +- databases/postgresql14-server/files/postgresql.in | 2 +- databases/postgresql15-server/Makefile | 2 +- databases/postgresql15-server/files/postgresql.in | 2 +- databases/postgresql16-server/Makefile | 2 +- databases/postgresql16-server/files/postgresql.in | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile index 7762b9b91697..b4eeef18d80e 100644 --- a/databases/postgresql12-server/Makefile +++ b/databases/postgresql12-server/Makefile @@ -1,7 +1,7 @@ DISTVERSION?= 12.17 # 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?= 3 +PORTREVISION?= 4 MAINTAINER?= pgsql@FreeBSD.org diff --git a/databases/postgresql12-server/files/postgresql.in b/databases/postgresql12-server/files/postgresql.in index ea232a915475..08f6faf12c55 100644 --- a/databases/postgresql12-server/files/postgresql.in +++ b/databases/postgresql12-server/files/postgresql.in @@ -64,7 +64,7 @@ if [ -n "$2" ]; then eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" - eval postgresql_login_class="\$postgresql_${profile}_login_class:-${postgresql_login_class}}" + eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" fi else diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile index 8ace87490b33..4dbb622c7dc0 100644 --- a/databases/postgresql13-server/Makefile +++ b/databases/postgresql13-server/Makefile @@ -1,7 +1,7 @@ DISTVERSION?= 13.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?= 3 +PORTREVISION?= 4 MAINTAINER?= pgsql@FreeBSD.org diff --git a/databases/postgresql13-server/files/postgresql.in b/databases/postgresql13-server/files/postgresql.in index ea232a915475..08f6faf12c55 100644 --- a/databases/postgresql13-server/files/postgresql.in +++ b/databases/postgresql13-server/files/postgresql.in @@ -64,7 +64,7 @@ if [ -n "$2" ]; then eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" - eval postgresql_login_class="\$postgresql_${profile}_login_class:-${postgresql_login_class}}" + eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" fi else diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile index 0e67fa4dc5d2..6339cff9b431 100644 --- a/databases/postgresql14-server/Makefile +++ b/databases/postgresql14-server/Makefile @@ -1,7 +1,7 @@ DISTVERSION?= 14.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?= 3 +PORTREVISION?= 4 MAINTAINER?= pgsql@FreeBSD.org diff --git a/databases/postgresql14-server/files/postgresql.in b/databases/postgresql14-server/files/postgresql.in index ea232a915475..08f6faf12c55 100644 --- a/databases/postgresql14-server/files/postgresql.in +++ b/databases/postgresql14-server/files/postgresql.in @@ -64,7 +64,7 @@ if [ -n "$2" ]; then eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" - eval postgresql_login_class="\$postgresql_${profile}_login_class:-${postgresql_login_class}}" + eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" fi else diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile index c4fa63f7baf1..a984c109a57b 100644 --- a/databases/postgresql15-server/Makefile +++ b/databases/postgresql15-server/Makefile @@ -1,7 +1,7 @@ DISTVERSION?= 15.5 # 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?= 3 +PORTREVISION?= 4 MAINTAINER?= pgsql@FreeBSD.org diff --git a/databases/postgresql15-server/files/postgresql.in b/databases/postgresql15-server/files/postgresql.in index ea232a915475..08f6faf12c55 100644 --- a/databases/postgresql15-server/files/postgresql.in +++ b/databases/postgresql15-server/files/postgresql.in @@ -64,7 +64,7 @@ if [ -n "$2" ]; then eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" - eval postgresql_login_class="\$postgresql_${profile}_login_class:-${postgresql_login_class}}" + eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" fi else diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile index 9c08dd554452..73f75307461c 100644 --- a/databases/postgresql16-server/Makefile +++ b/databases/postgresql16-server/Makefile @@ -2,7 +2,7 @@ PORTNAME?= postgresql DISTVERSION?= 16.1 # 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?= 3 +PORTREVISION?= 4 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} diff --git a/databases/postgresql16-server/files/postgresql.in b/databases/postgresql16-server/files/postgresql.in index ea232a915475..08f6faf12c55 100644 --- a/databases/postgresql16-server/files/postgresql.in +++ b/databases/postgresql16-server/files/postgresql.in @@ -64,7 +64,7 @@ if [ -n "$2" ]; then eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" - eval postgresql_login_class="\$postgresql_${profile}_login_class:-${postgresql_login_class}}" + eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" fi else -- cgit v1.2.3