git: df154b989620 - 2021Q2 - databases/postgresql??-server: rc-script should require DAEMON

[Palle Girgensohn]

The branch 2021Q2 has been updated by girgen:

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

commit df154b989620e4c84258747601cc678e15dd119e
Author:     Palle Girgensohn <girgen at FreeBSD.org>
AuthorDate: 2021-06-01 13:59:02 +0000
Commit:     Palle Girgensohn <girgen at FreeBSD.org>
CommitDate: 2021-06-01 14:06:02 +0000

    databases/postgresql??-server: rc-script should require DAEMON
    
    Changeset ab83f2b4bb78 changed the startup order for Postgresql. The cleartmp
    rc.d now comes after the Postgresql startup.  Unfortunately, Postgresql likes
    to create a socket in /tmp/.s.PGSQL.5432. After cleartmp does its work, that
    socket disappears from the filesystem.
    
    Submitted by:   Jeroen Pulles
    PR:             256335
    
    (cherry picked from commit 8d831eb43aba59013b948830cbd4b22b45deb223)
---
 databases/postgresql10-server/Makefile            | 2 +-
 databases/postgresql10-server/files/postgresql.in | 2 +-
 databases/postgresql11-server/Makefile            | 2 +-
 databases/postgresql11-server/files/postgresql.in | 2 +-
 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/postgresql96-server/Makefile            | 2 +-
 databases/postgresql96-server/files/postgresql.in | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
index ab8ff8d6c370..e5b1983286d4 100644
--- a/databases/postgresql10-server/Makefile
+++ b/databases/postgresql10-server/Makefile
@@ -3,7 +3,7 @@
 DISTVERSION?=	10.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?=	0
+PORTREVISION?=	1
 
 MAINTAINER?=	pgsql at FreeBSD.org
 
diff --git a/databases/postgresql10-server/files/postgresql.in b/databases/postgresql10-server/files/postgresql.in
index 88ace679b95c..50725fd59103 100644
--- a/databases/postgresql10-server/files/postgresql.in
+++ b/databases/postgresql10-server/files/postgresql.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: postgresql
-# REQUIRE: SERVERS
+# REQUIRE: DEAMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile
index 8c6a07727012..b35cab5d02fb 100644
--- a/databases/postgresql11-server/Makefile
+++ b/databases/postgresql11-server/Makefile
@@ -3,7 +3,7 @@
 DISTVERSION?=	11.12
 # 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 at FreeBSD.org
 
diff --git a/databases/postgresql11-server/files/postgresql.in b/databases/postgresql11-server/files/postgresql.in
index 080d3e40cd6f..fa88459a55cb 100644
--- a/databases/postgresql11-server/files/postgresql.in
+++ b/databases/postgresql11-server/files/postgresql.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: postgresql
-# REQUIRE: SERVERS
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index 8998336755d0..e12a24422878 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -3,7 +3,7 @@
 DISTVERSION?=	12.7
 # 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 at FreeBSD.org
 
diff --git a/databases/postgresql12-server/files/postgresql.in b/databases/postgresql12-server/files/postgresql.in
index 3437e47c6de4..b1075f2f3a10 100644
--- a/databases/postgresql12-server/files/postgresql.in
+++ b/databases/postgresql12-server/files/postgresql.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: postgresql
-# REQUIRE: SERVERS
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index e1da009389db..d41b1965cc07 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -4,7 +4,7 @@ PORTNAME?=	postgresql
 DISTVERSION?=	13.3
 # 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}
diff --git a/databases/postgresql13-server/files/postgresql.in b/databases/postgresql13-server/files/postgresql.in
index cf67a65fa1e8..6846247c39aa 100644
--- a/databases/postgresql13-server/files/postgresql.in
+++ b/databases/postgresql13-server/files/postgresql.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: postgresql
-# REQUIRE: SERVERS
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile
index 7d2e6ee38aae..5a951ba92767 100644
--- a/databases/postgresql96-server/Makefile
+++ b/databases/postgresql96-server/Makefile
@@ -3,7 +3,7 @@
 DISTVERSION?=	9.6.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
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql at FreeBSD.org
diff --git a/databases/postgresql96-server/files/postgresql.in b/databases/postgresql96-server/files/postgresql.in
index f9bd89ffa3df..6cdd1f252383 100644
--- a/databases/postgresql96-server/files/postgresql.in
+++ b/databases/postgresql96-server/files/postgresql.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: postgresql
-# REQUIRE: SERVERS
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL: