diff options
author | adam <adam> | 2011-09-27 07:24:46 +0000 |
---|---|---|
committer | adam <adam> | 2011-09-27 07:24:46 +0000 |
commit | b3604e7ab66036a892e9f1cb877b4abf45905ad3 (patch) | |
tree | ff64dda68cca1968c30e1680d87b53d9db6f9c8e | |
parent | 0b3fb7ca10f1a67eb91d871c6b6e9afdf18f7eb6 (diff) | |
download | pkgsrc-b3604e7ab66036a892e9f1cb877b4abf45905ad3.tar.gz |
Fix for PR#45403
-rw-r--r-- | databases/postgresql83-server/files/pgsql.sh | 8 | ||||
-rw-r--r-- | databases/postgresql84-server/files/pgsql.sh | 8 | ||||
-rw-r--r-- | databases/postgresql90-server/files/pgsql.sh | 8 | ||||
-rw-r--r-- | databases/postgresql91-server/files/pgsql.sh | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/databases/postgresql83-server/files/pgsql.sh b/databases/postgresql83-server/files/pgsql.sh index ef02b5b74a4..2d6b9c8ec1a 100644 --- a/databases/postgresql83-server/files/pgsql.sh +++ b/databases/postgresql83-server/files/pgsql.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: pgsql.sh,v 1.5 2011/03/04 14:26:23 adam Exp $ +# $NetBSD: pgsql.sh,v 1.6 2011/09/27 07:26:01 adam Exp $ # # PostgreSQL database rc.d control script # @@ -26,9 +26,9 @@ name="pgsql" rcvar=${name} command="@PREFIX@/bin/pg_ctl" procname="@PREFIX@/bin/postgres" -pgsql_user="@PGUSER@" -pgsql_group="@PGGROUP@" -pgsql_home="@PGHOME@" +: ${pgsql_user:=@PGUSER@} +: ${pgsql_group:=@PGGROUP@} +: ${pgsql_home:=@PGHOME@} extra_commands="initdb reload" initdb_cmd="pgsql_initdb" diff --git a/databases/postgresql84-server/files/pgsql.sh b/databases/postgresql84-server/files/pgsql.sh index 6ad9d41c4cb..f3ea1d98d13 100644 --- a/databases/postgresql84-server/files/pgsql.sh +++ b/databases/postgresql84-server/files/pgsql.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: pgsql.sh,v 1.4 2011/03/04 14:26:23 adam Exp $ +# $NetBSD: pgsql.sh,v 1.5 2011/09/27 07:25:05 adam Exp $ # # PostgreSQL database rc.d control script # @@ -26,9 +26,9 @@ name="pgsql" rcvar=${name} command="@PREFIX@/bin/pg_ctl" procname="@PREFIX@/bin/postgres" -pgsql_user="@PGUSER@" -pgsql_group="@PGGROUP@" -pgsql_home="@PGHOME@" +: ${pgsql_user:=@PGUSER@} +: ${pgsql_group:=@PGGROUP@} +: ${pgsql_home:=@PGHOME@} extra_commands="initdb reload" initdb_cmd="pgsql_initdb" diff --git a/databases/postgresql90-server/files/pgsql.sh b/databases/postgresql90-server/files/pgsql.sh index 1f661d37017..57b396d6411 100644 --- a/databases/postgresql90-server/files/pgsql.sh +++ b/databases/postgresql90-server/files/pgsql.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: pgsql.sh,v 1.2 2010/12/19 09:53:29 adam Exp $ +# $NetBSD: pgsql.sh,v 1.3 2011/09/27 07:24:46 adam Exp $ # # PostgreSQL database rc.d control script # @@ -26,9 +26,9 @@ name="pgsql" rcvar=${name} command="@PREFIX@/bin/pg_ctl" procname="@PREFIX@/bin/postgres" -pgsql_user="@PGUSER@" -pgsql_group="@PGGROUP@" -pgsql_home="@PGHOME@" +: ${pgsql_user:=@PGUSER@} +: ${pgsql_group:=@PGGROUP@} +: ${pgsql_home:=@PGHOME@} extra_commands="initdb reload" initdb_cmd="pgsql_initdb" diff --git a/databases/postgresql91-server/files/pgsql.sh b/databases/postgresql91-server/files/pgsql.sh index ec81e335dd7..5cc53c14b13 100644 --- a/databases/postgresql91-server/files/pgsql.sh +++ b/databases/postgresql91-server/files/pgsql.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: pgsql.sh,v 1.1.1.1 2011/09/15 08:28:29 adam Exp $ +# $NetBSD: pgsql.sh,v 1.2 2011/09/27 07:24:54 adam Exp $ # # PostgreSQL database rc.d control script # @@ -26,9 +26,9 @@ name="pgsql" rcvar=${name} command="@PREFIX@/bin/pg_ctl" procname="@PREFIX@/bin/postgres" -pgsql_user="@PGUSER@" -pgsql_group="@PGGROUP@" -pgsql_home="@PGHOME@" +: ${pgsql_user:=@PGUSER@} +: ${pgsql_group:=@PGGROUP@} +: ${pgsql_home:=@PGHOME@} extra_commands="initdb reload" initdb_cmd="pgsql_initdb" |