2 files changed, 17 insertions, 6 deletions
diff --git a/databases/postgresql81-server/files/pkg-message-server.in b/databases/postgresql81-server/files/pkg-message-server.in
index d22a731f40d8..cd6c42ed2090 100644
--- a/databases/postgresql81-server/files/pkg-message-server.in
+++ b/databases/postgresql81-server/files/pkg-message-server.in
@@ -30,13 +30,19 @@ If you plan to access your PostgreSQL server using ODBC, please
 consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
 to get the functions required for ODBC compliance.
 
-If you need to store any characters besides strict ASCII in your
-database, you will want to set a character set, and possibly a
-collation locale, before initializing the database. Add something
-similar to this to /etc/login.conf:
+Please note that if you use the rc script,
+%%PREFIX%%/etc/rc.conf/postgresql, to initialize the database, unicode
+(UTF-8) will be used to store character data by default.  Set
+postgresql_initdb_flags or use login.conf settings described below to
+alter this behaviour. See the start rc script for more info.
+
+To set limits, environment stuff like locale and collation and other
+things, you can set up a class in /etc/login.conf before initializing
+the database. Add something similar to this to /etc/login.conf:
 ---
 postgres:\
-	:setenv=LC_ALL=en_US.UTF-8,LC_COLLATE=C:\
+	:lang=en_US.UTF-8:\
+	:setenv=LC_COLLATE=C:\
 	:tc=default:
 ---
 and run `cap_mkdb /etc/login.conf'.
diff --git a/databases/postgresql81-server/files/postgresql.in b/databases/postgresql81-server/files/postgresql.in
index 3456ed3d7282..1b3b4226acdf 100644
--- a/databases/postgresql81-server/files/postgresql.in
+++ b/databases/postgresql81-server/files/postgresql.in
@@ -12,6 +12,10 @@
 #  # optional
 #  postgresql_data="%%PREFIX%%/pgsql/data"
 #  postgresql_flags="-w -s -m fast"
+#  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
+#  postgresql_class="default"
+#
+# See %%PREFIX%%/share/doc/postgresql/README-server for more info
 #
 # This scripts takes one of the following commands:
 #
@@ -32,6 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
 postgresql_user=pgsql
 eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
 postgresql_class=${postgresql_class:-"default"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
 
 name=postgresql
 rcvar=`set_rcvar`
@@ -53,7 +58,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -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"