diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index c9719d557b07..32063d95bf32 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	7.3.12
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql73-server/files/pgsql.sh.tmpl b/databases/postgresql73-server/files/pgsql.sh.tmpl
index 8d975d54303c..2f7554620e89 100644
--- a/databases/postgresql73-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql73-server/files/pgsql.sh.tmpl
@@ -35,7 +35,7 @@ postgresql_class=${postgresql_class:-"default"}
 name=postgresql
 rcvar=`set_rcvar`
 command=${prefix}/bin/pg_ctl
-command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
 start_cmd="postgresql_command start"
@@ -48,7 +48,7 @@ initdb_cmd="postgresql_initdb"
 
 postgresql_command()
 {
-    su -l ${postgresql_user} -c "exec ${command} ${command_args}"
+    su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
 }
     
 postgresql_initdb()
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 738122a284e0..e4a45be025ba 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	7.4.10
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql74-server/files/pgsql.sh.tmpl b/databases/postgresql74-server/files/pgsql.sh.tmpl
index 8d975d54303c..2f7554620e89 100644
--- a/databases/postgresql74-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql74-server/files/pgsql.sh.tmpl
@@ -35,7 +35,7 @@ postgresql_class=${postgresql_class:-"default"}
 name=postgresql
 rcvar=`set_rcvar`
 command=${prefix}/bin/pg_ctl
-command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
 start_cmd="postgresql_command start"
@@ -48,7 +48,7 @@ initdb_cmd="postgresql_initdb"
 
 postgresql_command()
 {
-    su -l ${postgresql_user} -c "exec ${command} ${command_args}"
+    su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
 }
     
 postgresql_initdb()
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 6802fc760519..bb8c0681dd69 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.0.5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql80-server/files/pgsql.sh.tmpl b/databases/postgresql80-server/files/pgsql.sh.tmpl
index 8d975d54303c..2f7554620e89 100644
--- a/databases/postgresql80-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql80-server/files/pgsql.sh.tmpl
@@ -35,7 +35,7 @@ postgresql_class=${postgresql_class:-"default"}
 name=postgresql
 rcvar=`set_rcvar`
 command=${prefix}/bin/pg_ctl
-command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
 start_cmd="postgresql_command start"
@@ -48,7 +48,7 @@ initdb_cmd="postgresql_initdb"
 
 postgresql_command()
 {
-    su -l ${postgresql_user} -c "exec ${command} ${command_args}"
+    su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
 }
     
 postgresql_initdb()
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 52f6100d8db2..6a99def196cf 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.1.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql81-server/files/pgsql.sh.tmpl b/databases/postgresql81-server/files/pgsql.sh.tmpl
index 8d975d54303c..2f7554620e89 100644
--- a/databases/postgresql81-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql81-server/files/pgsql.sh.tmpl
@@ -35,7 +35,7 @@ postgresql_class=${postgresql_class:-"default"}
 name=postgresql
 rcvar=`set_rcvar`
 command=${prefix}/bin/pg_ctl
-command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
 start_cmd="postgresql_command start"
@@ -48,7 +48,7 @@ initdb_cmd="postgresql_initdb"
 
 postgresql_command()
 {
-    su -l ${postgresql_user} -c "exec ${command} ${command_args}"
+    su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
 }
     
 postgresql_initdb()
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 52f6100d8db2..6a99def196cf 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.1.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql82-server/files/pgsql.sh.tmpl b/databases/postgresql82-server/files/pgsql.sh.tmpl
index 8d975d54303c..2f7554620e89 100644
--- a/databases/postgresql82-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql82-server/files/pgsql.sh.tmpl
@@ -35,7 +35,7 @@ postgresql_class=${postgresql_class:-"default"}
 name=postgresql
 rcvar=`set_rcvar`
 command=${prefix}/bin/pg_ctl
-command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
 start_cmd="postgresql_command start"
@@ -48,7 +48,7 @@ initdb_cmd="postgresql_initdb"
 
 postgresql_command()
 {
-    su -l ${postgresql_user} -c "exec ${command} ${command_args}"
+    su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
 }
     
 postgresql_initdb()
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 52f6100d8db2..6a99def196cf 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.1.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql83-server/files/pgsql.sh.tmpl b/databases/postgresql83-server/files/pgsql.sh.tmpl
index 8d975d54303c..2f7554620e89 100644
--- a/databases/postgresql83-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql83-server/files/pgsql.sh.tmpl
@@ -35,7 +35,7 @@ postgresql_class=${postgresql_class:-"default"}
 name=postgresql
 rcvar=`set_rcvar`
 command=${prefix}/bin/pg_ctl
-command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
 start_cmd="postgresql_command start"
@@ -48,7 +48,7 @@ initdb_cmd="postgresql_initdb"
 
 postgresql_command()
 {
-    su -l ${postgresql_user} -c "exec ${command} ${command_args}"
+    su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
 }
     
 postgresql_initdb()
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 52f6100d8db2..6a99def196cf 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.1.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql84-server/files/pgsql.sh.tmpl b/databases/postgresql84-server/files/pgsql.sh.tmpl
index 8d975d54303c..2f7554620e89 100644
--- a/databases/postgresql84-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql84-server/files/pgsql.sh.tmpl
@@ -35,7 +35,7 @@ postgresql_class=${postgresql_class:-"default"}
 name=postgresql
 rcvar=`set_rcvar`
 command=${prefix}/bin/pg_ctl
-command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
 start_cmd="postgresql_command start"
@@ -48,7 +48,7 @@ initdb_cmd="postgresql_initdb"
 
 postgresql_command()
 {
-    su -l ${postgresql_user} -c "exec ${command} ${command_args}"
+    su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
 }
     
 postgresql_initdb()
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 52f6100d8db2..6a99def196cf 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.1.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql90-server/files/pgsql.sh.tmpl b/databases/postgresql90-server/files/pgsql.sh.tmpl
index 8d975d54303c..2f7554620e89 100644
--- a/databases/postgresql90-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql90-server/files/pgsql.sh.tmpl
@@ -35,7 +35,7 @@ postgresql_class=${postgresql_class:-"default"}
 name=postgresql
 rcvar=`set_rcvar`
 command=${prefix}/bin/pg_ctl
-command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
 start_cmd="postgresql_command start"
@@ -48,7 +48,7 @@ initdb_cmd="postgresql_initdb"
 
 postgresql_command()
 {
-    su -l ${postgresql_user} -c "exec ${command} ${command_args}"
+    su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
 }
     
 postgresql_initdb()
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 52f6100d8db2..6a99def196cf 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.1.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql91-server/files/pgsql.sh.tmpl b/databases/postgresql91-server/files/pgsql.sh.tmpl
index 8d975d54303c..2f7554620e89 100644
--- a/databases/postgresql91-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql91-server/files/pgsql.sh.tmpl
@@ -35,7 +35,7 @@ postgresql_class=${postgresql_class:-"default"}
 name=postgresql
 rcvar=`set_rcvar`
 command=${prefix}/bin/pg_ctl
-command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
 start_cmd="postgresql_command start"
@@ -48,7 +48,7 @@ initdb_cmd="postgresql_initdb"
 
 postgresql_command()
 {
-    su -l ${postgresql_user} -c "exec ${command} ${command_args}"
+    su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
 }
     
 postgresql_initdb()
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 52f6100d8db2..6a99def196cf 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.1.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql92-server/files/pgsql.sh.tmpl b/databases/postgresql92-server/files/pgsql.sh.tmpl
index 8d975d54303c..2f7554620e89 100644
--- a/databases/postgresql92-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql92-server/files/pgsql.sh.tmpl
@@ -35,7 +35,7 @@ postgresql_class=${postgresql_class:-"default"}
 name=postgresql
 rcvar=`set_rcvar`
 command=${prefix}/bin/pg_ctl
-command_args="-D ${postgresql_data} ${postgresql_flags} $1"
+command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
 start_cmd="postgresql_command start"
@@ -48,7 +48,7 @@ initdb_cmd="postgresql_initdb"
 
 postgresql_command()
 {
-    su -l ${postgresql_user} -c "exec ${command} ${command_args}"
+    su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
 }
     
 postgresql_initdb()