9 files changed, 92 insertions, 3 deletions
diff --git a/databases/postgresql84-server/files/pgsql.sh.tmpl b/databases/postgresql83-server/files/postgresql.in
index 3456ed3d7282..a44c713d6b25 100644
--- a/databases/postgresql84-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql83-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`
diff --git a/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
index da57f46e3552..7c2831c41be0 100644
--- a/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql84-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
@@ -1,5 +1,5 @@
---- src/backend/utils/misc/postgresql.conf.sample~	Tue Nov  8 00:45:49 2005
-+++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov  8 00:47:16 2005
+--- src/backend/utils/misc/postgresql.conf.sample.orig	Sun May 21 22:11:02 2006
++++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov  7 17:23:50 2006
 @@ -206,6 +206,7 @@
  
  # - Where to Log -
@@ -16,3 +16,12 @@
  #silent_mode = off			# DO NOT USE without syslog or 
  					# redirect_stderr
  
+@@ -339,6 +341,8 @@
+ #---------------------------------------------------------------------------
+ # AUTOVACUUM PARAMETERS
+ #---------------------------------------------------------------------------
++
++autovacuum = on
+ 
+ #autovacuum = off			# enable autovacuum subprocess?
+ #autovacuum_naptime = 60		# time between autovacuum runs, in secs
diff --git a/databases/postgresql84-server/pkg-message-client b/databases/postgresql84-server/files/pkg-message-client.in
index 722d50cb4244..722d50cb4244 100644
--- a/databases/postgresql84-server/pkg-message-client
+++ b/databases/postgresql84-server/files/pkg-message-client.in
diff --git a/databases/postgresql82-server/pkg-message-contrib b/databases/postgresql84-server/files/pkg-message-contrib.in
index 8120f2d8d89c..2b29ffd33041 100644
--- a/databases/postgresql82-server/pkg-message-contrib
+++ b/databases/postgresql84-server/files/pkg-message-contrib.in
@@ -1,3 +1,3 @@
 The PostgreSQL contrib utilities have been installed. Please see
-/usr/local/share/doc/postgresql/contrib/README
+%%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
diff --git a/databases/postgresql84-server/pkg-message-plperl b/databases/postgresql84-server/files/pkg-message-plperl.in
index 5d0c83920563..5d0c83920563 100644
--- a/databases/postgresql84-server/pkg-message-plperl
+++ b/databases/postgresql84-server/files/pkg-message-plperl.in
diff --git a/databases/postgresql84-server/pkg-message-plpython b/databases/postgresql84-server/files/pkg-message-plpython.in
index c413582b6295..c413582b6295 100644
--- a/databases/postgresql84-server/pkg-message-plpython
+++ b/databases/postgresql84-server/files/pkg-message-plpython.in
diff --git a/databases/postgresql84-server/pkg-message-pltcl b/databases/postgresql84-server/files/pkg-message-pltcl.in
index 0902b858de0b..0902b858de0b 100644
--- a/databases/postgresql84-server/pkg-message-pltcl
+++ b/databases/postgresql84-server/files/pkg-message-pltcl.in
diff --git a/databases/postgresql84-server/files/pkg-message-server.in b/databases/postgresql84-server/files/pkg-message-server.in
new file mode 100644
index 000000000000..cd6c42ed2090
--- /dev/null
+++ b/databases/postgresql84-server/files/pkg-message-server.in
@@ -0,0 +1,70 @@
+For procedural languages and postgresql functions, please note that
+you might have to update them when updating the server.
+
+If you have many tables and many clients running, consider raising
+kern.maxfiles using sysctl(8), or reconfigure your kernel
+appropriately.
+
+The port is set up to use autovacuum for new databases, but you might
+also want to vacuum and perhaps backup your database regularly. There
+is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
+you may find useful. You can use it to backup and perfom vacuum on all
+databases nightly. Per default, it perfoms `vacuum analyze'. See the
+script for instructions. For autovacuum settings, please review
+~pgsql/data/postgresql.conf.
+
+To allow many simultaneous connections to your PostgreSQL server, you
+should raise the SystemV shared memory limits in your kernel. Here are
+example values for allowing up to 180 clients (configurations in
+postgresql.conf also needed, of course):
+  options         SYSVSHM
+  options         SYSVSEM
+  options         SYSVMSG
+  options         SHMMAXPGS=65536
+  options         SEMMNI=40
+  options         SEMMNS=240
+  options         SEMUME=40
+  options         SEMMNU=120
+
+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.
+
+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:\
+	:lang=en_US.UTF-8:\
+	:setenv=LC_COLLATE=C:\
+	:tc=default:
+---
+and run `cap_mkdb /etc/login.conf'.
+Then add 'postgresql_class="postgres"' to /etc/rc.conf.
+
+======================================================================
+
+To initialize the database, run
+
+  %%PREFIX%%/etc/rc.d/postgresql initdb
+
+You can then start PostgreSQL by running:
+
+  %%PREFIX%%/etc/rc.d/postgresql start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port logs to syslog by default
+    See ~pgsql/data/postgresql.conf for more info
+
+======================================================================
+
+To run PostgreSQL at startup, add
+'postgresql_enable="YES"' to /etc/rc.conf
+
diff --git a/databases/postgresql90-server/files/pgsql.sh.tmpl b/databases/postgresql84-server/files/postgresql.in
index 3456ed3d7282..a44c713d6b25 100644
--- a/databases/postgresql90-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql84-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`