From nobody Sun Jan 14 10:02:04 2024 X-Original-To: dev-commits-ports-all@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 4TCW5m3QzCz57ZC0; Sun, 14 Jan 2024 10:02:04 +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 4TCW5m2z4sz4kqJ; Sun, 14 Jan 2024 10:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705226524; 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=OxfgpFWko8SRDUGtXb2Rn4p/mTHsnAOcGqhzKew94XM=; b=DM46IVNjSi0M6YxNFrM9VnorRxd/8Y0bn/KJTepcW2dMGUSgQxQ0hurpvZYqV3RRiXvrg+ g0M2T/pEQY1I6hxHNUv8dhXfWOEti/5V8U0mgh/Ntm2kbPP8ECMd0e/Vlx/dSkbvo58+gc VYTTjtl4q/ocLQf//ik1pZEVkZDq9P6X/tVo5rOG0kAKQvDRaVQM6a/7uukS/y3K4gVgA/ JqPS5AhmrYN9VFihXE/+xeQuaendjgJ5vJSJy48dm7mQmBgZjkx3Cx7f5jiePf2dlUeYmF 4qUgHE/+ZAxScQhHLfmGPiwIdghIF0Ewjy5GccG4fZkSM6TyslZgBY1cK+0q3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705226524; 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=OxfgpFWko8SRDUGtXb2Rn4p/mTHsnAOcGqhzKew94XM=; b=iTYyap9QRkaLaUCCn3i0QXBdvgrNBFNviGfllJfdpyXQWyeTYvd44NFIkvDrFngftuEtsa V9qwydu26b88fqVCaL+tD0CtD1usFQ/Fk2WT+ilha7NeQ2JmZXWaXay6c34FskY8UNKZiU 4itP6qifKELXXNllS5qNAvoGSIlShujW6e3BIFStz+XV0EmIaG8V2H/x2z+vnjNKqglhYU QmWrfWtkSeEQVR8zHq4CDNIkXKsWWPAPK3Z1eJZXvMYEenu81VEoUXv51w9RDRN7OkSSuN hb/2JQbHdp4D0+1yoIyUK/j0igAkj1ubhZNn7uLywAHVrNcHK4QQDUsr3hl7RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705226524; a=rsa-sha256; cv=none; b=TvY/HcAWMGXUSh69P5syQgFrm8iuOnuBz1N7dfOCgnQkTPit1xbQTIgwP1P8L3PUCd43mZ Aphxnf97C5nkI+P65RDQ/X9D68K+MEIqWt0wJssga7/woumiZsnQNL3SekDtXTQdPVW1t/ nUfL8WOV45FU2vO93y46hDBPTXDB0kxc2fdDdWfBde7T7YeIV653IsvumRFPa87EZ8LEx5 lfSrVBEmh1/0Ku154ZG1k1t2bur2m3wSUNIS808N8jqsk94RdVCi0eGPKaRNEO+vYC8iVJ wsWha2/ijisMm89keNsrqj6ApOXN3Nv8wFw7rreCmoWg/k7KDQeBcn/3i7opFQ== 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 4TCW5m22TRz1804; Sun, 14 Jan 2024 10:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40EA24Bx048743; Sun, 14 Jan 2024 10:02:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40EA249m048740; Sun, 14 Jan 2024 10:02:04 GMT (envelope-from git) Date: Sun, 14 Jan 2024 10:02:04 GMT Message-Id: <202401141002.40EA249m048740@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Palle Girgensohn Subject: git: 585adf391b88 - main - postgresql??-server: fix rc script bug when using profiles List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: girgen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 585adf391b886f17b2e2508d0008927702147bac Auto-Submitted: auto-generated The branch main has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=585adf391b886f17b2e2508d0008927702147bac commit 585adf391b886f17b2e2508d0008927702147bac Author: Palle Girgensohn AuthorDate: 2024-01-14 10:00:18 +0000 Commit: Palle Girgensohn CommitDate: 2024-01-14 10:00:18 +0000 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