4 files changed, 40 insertions, 36 deletions

diff --git a/databases/pgcluster/Makefile b/databases/pgcluster/Makefile
index 94356400ee38..afff15ed1ae4 100644
--- a/databases/pgcluster/Makefile
+++ b/databases/pgcluster/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	pgcluster
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/OLD/v${BASEPGSQL}
diff --git a/databases/pgcluster/files/pgcluster.in b/databases/pgcluster/files/pgcluster.in
index aec8d3e4a80b..005e1d66d960 100644
--- a/databases/pgcluster/files/pgcluster.in
+++ b/databases/pgcluster/files/pgcluster.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/databases/pgcluster/files/Attic/pgcluster.in,v 1.1 2007-07-16 10:53:48 rafan Exp $
+# $FreeBSD: /tmp/pcvs/ports/databases/pgcluster/files/Attic/pgcluster.in,v 1.2 2007-07-26 16:05:04 rafan Exp $
 #
 # PROVIDE: pgcluster
 # REQUIRE: DAEMON
@@ -14,27 +14,30 @@
 # pgcluster_flags="-w -s"
 #
 
-pgcluster_enable=${pgcluster_enable-"NO"}
-pgcluster_data=${pgcluster_data-"%%PREFIX%%/pgsql/data"}
-pgcluster_flags=${pgcluster_flags-"-w -s"}
-
 . %%RC_SUBR%%
 
-load_rc_config pgcluster
-
-name=pgcluster
+name="pgcluster"
 rcvar=`set_rcvar`
+
 command=%%PREFIX%%/bin/pg_ctl
+
+load_rc_config ${name}
+
+: ${pgcluster_enable="NO"}
+: ${pgcluster_data="%%PREFIX%%/pgsql/data"}
+: ${pgcluster_flags="-w -s"}
+
 pgcluster_user=pgsql
+pgcluster_flags="${pgcluster_flags} -D ${pgcluster_data}"
+pidfile="${pgcluster_data}/postmaster.pid"
+
 extra_commands="initdb recover"
+
 initdb_cmd="pgcluster_initdb"
 recover_cmd="pgcluster_recover"
 start_cmd="pgcluster_start"
 stop_cmd="pgcluster_stop"
 
-pgcluster_flags="${pgcluster_flags} -D ${pgcluster_data}"
-pidfile="${pgcluster_data}/postmaster.pid"
-
 pgcluster_start()
 {
     su -m ${pgcluster_user} -c "exec ${command} start ${pgcluster_flags} -o '-i'"
@@ -52,5 +55,4 @@ pgcluster_initdb()
     su -m ${pgcluster_user} -c "exec %%PREFIX%%/bin/initdb -D ${pgcluster_data}"
 }
 
-load_rc_config $name
 run_rc_command "$1"
diff --git a/databases/pgcluster/files/pglb.in b/databases/pgcluster/files/pglb.in
index 934b3a928352..bf54beefa38b 100644
--- a/databases/pgcluster/files/pglb.in
+++ b/databases/pgcluster/files/pglb.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/databases/pgcluster/files/Attic/pglb.in,v 1.1 2007-07-16 10:53:48 rafan Exp $
+# $FreeBSD: /tmp/pcvs/ports/databases/pgcluster/files/Attic/pglb.in,v 1.2 2007-07-26 16:05:04 rafan Exp $
 #
 # PROVIDE: pglb
 # REQUIRE: DAEMON
@@ -10,25 +10,26 @@
 # pglb_enable="YES"
 #
 
-pglb_enable=${pglb_enable-"NO"}
-pglb_data=${pglb_data-"%%PREFIX%%/pgsql/data"}
-
 . %%RC_SUBR%%
 
-load_rc_config pglb
-
-name=pglb
+name="pglb"
 rcvar=`set_rcvar`
-command=%%PREFIX%%/bin/pglb
-pglb_user=pgsql
-stop_cmd="pglb_stop"
 
+command=%%PREFIX%%/bin/${name}
+
+load_rc_config $name
+
+: ${pglb_enable="NO"}
+: ${pglb_data="%%PREFIX%%/pgsql/data"}
+
+pglb_user=pgsql
 pglb_flags="${pglb_flags} -D ${pglb_data}"
 
+stop_cmd="pglb_stop"
+
 pglb_stop()
 {
     su -m ${pglb_user} -c "exec ${command} -D ${pglb_data} stop"
 }
 
-load_rc_config $name
 run_rc_command "$1"
diff --git a/databases/pgcluster/files/pgreplicate.in b/databases/pgcluster/files/pgreplicate.in
index 0ee716fdd1b5..d2fed68f5483 100644
--- a/databases/pgcluster/files/pgreplicate.in
+++ b/databases/pgcluster/files/pgreplicate.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/databases/pgcluster/files/Attic/pgreplicate.in,v 1.1 2007-07-16 10:53:48 rafan Exp $
+# $FreeBSD: /tmp/pcvs/ports/databases/pgcluster/files/Attic/pgreplicate.in,v 1.2 2007-07-26 16:05:04 rafan Exp $
 #
 # PROVIDE: pgreplicate
 # REQUIRE: DAEMON
@@ -11,26 +11,27 @@
 # pgreplicate_enable="YES"
 #
 
-pgreplicate_enable=${pgreplicate_enable-"NO"}
-pgreplicate_data=${pgreplicate_data-"%%PREFIX%%/pgsql/data"}
-
 . %%RC_SUBR%%
 
-load_rc_config pgreplicate
-
-name=pgreplicate
+name="pgreplicate"
 rcvar=`set_rcvar`
-command=%%PREFIX%%/bin/pgreplicate
-pgreplicate_user=pgsql
-stop_cmd="pgreplicate_stop"
 
+command=%%PREFIX%%/bin/${name}
+
+load_rc_config $name
+
+: ${pgreplicate_enable="NO"}
+: ${pgreplicate_data="%%PREFIX%%/pgsql/data"}
+
+pgreplicate_user=pgsql
 pgreplicate_flags="${pgreplicate_flags} -D ${pgreplicate_data}"
-pidfile="${pgreplicate_data}/pgreplicate.pid"
+pidfile="${pgreplicate_data}/${name}.pid"
+
+stop_cmd="pgreplicate_stop"
 
 pgreplicate_stop()
 {
     su -m ${pgreplicate_user} -c "exec ${command} -D ${pgreplicate_data} stop"
 }
 
-load_rc_config $name
 run_rc_command "$1"