12 files changed, 25 insertions, 37 deletions

diff --git a/databases/pgbouncer/files/pgbouncer.sh.in b/databases/pgbouncer/files/pgbouncer.sh.in
index a42f9465e411..cd0f609fb3f9 100644
--- a/databases/pgbouncer/files/pgbouncer.sh.in
+++ b/databases/pgbouncer/files/pgbouncer.sh.in
@@ -8,9 +8,10 @@
 # BEFORE:  securelevel
 # KEYWORD: shutdown
 
-# Add the following line to /etc/rc.conf to enable `pgbouncer':
+# Add the following lines to /etc/rc.conf to enable pgbouncer:
 #
-#pgbouncer_enable="YES"
+# pgbouncer_enable="YES"
+# pgbouncer_flags="<set as needed>"
 #
 
 . "%%RC_SUBR%%"
@@ -30,6 +31,5 @@ required_files="${config_file}"
 load_rc_config "$name"
 : ${pgbouncer_enable="NO"}
 : ${pgbouncer_user="%%PGBOUNCER_USER%%"}
-: ${pgbouncer_flags=""}
 
 run_rc_command "$1"
diff --git a/databases/postgresql73-server/files/postgresql.in b/databases/postgresql73-server/files/postgresql.in
index 1b3b4226acdf..6d8dcd21f154 100644
--- a/databases/postgresql73-server/files/postgresql.in
+++ b/databases/postgresql73-server/files/postgresql.in
@@ -23,8 +23,7 @@
 #
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
-prefix=%%PREFIX%%
-command=${prefix}/bin/pg_ctl
+command=%%PREFIX%%/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -58,7 +57,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql74-server/files/postgresql.in b/databases/postgresql74-server/files/postgresql.in
index 1b3b4226acdf..6d8dcd21f154 100644
--- a/databases/postgresql74-server/files/postgresql.in
+++ b/databases/postgresql74-server/files/postgresql.in
@@ -23,8 +23,7 @@
 #
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
-prefix=%%PREFIX%%
-command=${prefix}/bin/pg_ctl
+command=%%PREFIX%%/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -58,7 +57,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql80-server/files/postgresql.in b/databases/postgresql80-server/files/postgresql.in
index 1b3b4226acdf..6d8dcd21f154 100644
--- a/databases/postgresql80-server/files/postgresql.in
+++ b/databases/postgresql80-server/files/postgresql.in
@@ -23,8 +23,7 @@
 #
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
-prefix=%%PREFIX%%
-command=${prefix}/bin/pg_ctl
+command=%%PREFIX%%/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -58,7 +57,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql81-server/files/postgresql.in b/databases/postgresql81-server/files/postgresql.in
index 1b3b4226acdf..6d8dcd21f154 100644
--- a/databases/postgresql81-server/files/postgresql.in
+++ b/databases/postgresql81-server/files/postgresql.in
@@ -23,8 +23,7 @@
 #
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
-prefix=%%PREFIX%%
-command=${prefix}/bin/pg_ctl
+command=%%PREFIX%%/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -58,7 +57,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql82-server/files/postgresql.in b/databases/postgresql82-server/files/postgresql.in
index 1b3b4226acdf..6d8dcd21f154 100644
--- a/databases/postgresql82-server/files/postgresql.in
+++ b/databases/postgresql82-server/files/postgresql.in
@@ -23,8 +23,7 @@
 #
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
-prefix=%%PREFIX%%
-command=${prefix}/bin/pg_ctl
+command=%%PREFIX%%/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -58,7 +57,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql83-server/files/postgresql.in b/databases/postgresql83-server/files/postgresql.in
index 1b3b4226acdf..6d8dcd21f154 100644
--- a/databases/postgresql83-server/files/postgresql.in
+++ b/databases/postgresql83-server/files/postgresql.in
@@ -23,8 +23,7 @@
 #
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
-prefix=%%PREFIX%%
-command=${prefix}/bin/pg_ctl
+command=%%PREFIX%%/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -58,7 +57,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql84-server/files/postgresql.in b/databases/postgresql84-server/files/postgresql.in
index 1b3b4226acdf..6d8dcd21f154 100644
--- a/databases/postgresql84-server/files/postgresql.in
+++ b/databases/postgresql84-server/files/postgresql.in
@@ -23,8 +23,7 @@
 #
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
-prefix=%%PREFIX%%
-command=${prefix}/bin/pg_ctl
+command=%%PREFIX%%/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -58,7 +57,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql90-server/files/postgresql.in b/databases/postgresql90-server/files/postgresql.in
index 1b3b4226acdf..6d8dcd21f154 100644
--- a/databases/postgresql90-server/files/postgresql.in
+++ b/databases/postgresql90-server/files/postgresql.in
@@ -23,8 +23,7 @@
 #
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
-prefix=%%PREFIX%%
-command=${prefix}/bin/pg_ctl
+command=%%PREFIX%%/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -58,7 +57,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql91-server/files/postgresql.in b/databases/postgresql91-server/files/postgresql.in
index 1b3b4226acdf..6d8dcd21f154 100644
--- a/databases/postgresql91-server/files/postgresql.in
+++ b/databases/postgresql91-server/files/postgresql.in
@@ -23,8 +23,7 @@
 #
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
-prefix=%%PREFIX%%
-command=${prefix}/bin/pg_ctl
+command=%%PREFIX%%/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -58,7 +57,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql92-server/files/postgresql.in b/databases/postgresql92-server/files/postgresql.in
index 1b3b4226acdf..6d8dcd21f154 100644
--- a/databases/postgresql92-server/files/postgresql.in
+++ b/databases/postgresql92-server/files/postgresql.in
@@ -23,8 +23,7 @@
 #
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
-prefix=%%PREFIX%%
-command=${prefix}/bin/pg_ctl
+command=%%PREFIX%%/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -58,7 +57,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
 }
 
 run_rc_command "$1"
diff --git a/databases/virtuoso/files/virtuoso.sh.in b/databases/virtuoso/files/virtuoso.sh.in
index 84e68a3527af..559107af8f7b 100644
--- a/databases/virtuoso/files/virtuoso.sh.in
+++ b/databases/virtuoso/files/virtuoso.sh.in
@@ -11,15 +11,14 @@
 #  virtuoso_enable="YES"
 #  # optional
 #  virtuoso_config="%%PREFIX%%/virtuoso/db/virtuoso.ini"
-#  virtuoso_flags=""
+#  virtuoso_flags="<set as needed>"
 #
 # This scripts takes one of the following commands:
 #
 #   start stop restart reload status
 #
 
-prefix=%%PREFIX%%
-command=${prefix}/bin/virtuoso
+command=%%PREFIX%%/bin/virtuoso
 
 . %%RC_SUBR%%
 
@@ -27,7 +26,6 @@ load_rc_config virtuoso
 
 # set defaults
 virtuoso_enable=${virtuoso_enable:-"NO"}
-virtuoso_flags=${virtuoso_flags:-""}
 virtuoso_user=virtuoso
 eval virtuoso_config=${virtuoso_config:-"~${virtuoso_user}/db/virtuoso.ini"}
 virtuoso_class=${virtuoso_class:-"default"}