Update PostgreSQL to latest versions.

http://www.postgresql.org/docs/current/static/release-8-3-5.html
http://www.postgresql.org/docs/current/static/release-8-2-11.html
http://www.postgresql.org/docs/current/static/release-8-1-15.html
http://www.postgresql.org/docs/current/static/release-8-0-19.html
http://www.postgresql.org/docs/current/static/release-7-4-23.html

Note that the GiST problem mentioned does not apply to users of
the FreeBSD port, since the previous version of PostgreSQL never
reached the ports tree, due to the freeze of the tree pending the
FreeBSD 7.1 update.

PR:	121848, 124713

40 files changed, 73 insertions, 80 deletions

diff --git a/databases/postgresql73-server/files/pkg-message-server.in b/databases/postgresql73-server/files/pkg-message-server.in
index d168c2dd022d..d2367e291511 100644
--- a/databases/postgresql73-server/files/pkg-message-server.in
+++ b/databases/postgresql73-server/files/pkg-message-server.in
@@ -28,7 +28,7 @@ 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
+%%PREFIX%%/etc/rc.d/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.
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 687a458a760e..fc7e6e0aebf4 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.4.21
+PORTVERSION?=	7.4.23
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index 32c907f98cb7..98e6b601e93f 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-7.4.21.tar.bz2) = b372d271bb30f703c241c7cc3d58f198
-SHA256 (postgresql/postgresql-7.4.21.tar.bz2) = 2c62d112a7addd4333d14101e508d2222a639e1698b8e4958ce1b05138f76932
-SIZE (postgresql/postgresql-7.4.21.tar.bz2) = 10282778
+MD5 (postgresql/postgresql-7.4.23.tar.bz2) = 28cc0f6721eb04cd2323bc75452709d9
+SHA256 (postgresql/postgresql-7.4.23.tar.bz2) = c96707c06d988718bbb31b7d1676e4cd698ba8b847420aae86b67f2381a53edf
+SIZE (postgresql/postgresql-7.4.23.tar.bz2) = 10291308
 MD5 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 16d037213b879963724da7809a0a1589
 SHA256 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 1e56f76560c86227b08faabf78e3a53de4188c6a8f9d1f38b1481427e8fdf74c
 SIZE (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 34662
diff --git a/databases/postgresql74-server/files/pkg-message-server.in b/databases/postgresql74-server/files/pkg-message-server.in
index ac9e73b293f9..3b1cf3a6a152 100644
--- a/databases/postgresql74-server/files/pkg-message-server.in
+++ b/databases/postgresql74-server/files/pkg-message-server.in
@@ -48,7 +48,7 @@ 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
+%%PREFIX%%/etc/rc.d/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.
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 1d375bfd18a2..922080ea6d3a 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.0.17
+PORTVERSION?=	8.0.19
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -108,7 +108,7 @@ USE_AUTOTOOLS=	autoconf:262
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	pg-8015-icu-xx-2008-06-11.diff.gz:icu
+PATCHFILES+=	pg-8019-icu-xx-2008-11-03.diff.gz:icu
 .  endif
 
 PATCH_DIST_STRIP=-p1
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index 6da35419f1d5..0ab098d27235 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (postgresql/postgresql-8.0.17.tar.bz2) = 0154b01820cb73aeca73b9d060cb3328
-SHA256 (postgresql/postgresql-8.0.17.tar.bz2) = e425602f60c034ecfd6ffe9b403d863cd99ff6fbc0891a8d59da33258a21a93b
-SIZE (postgresql/postgresql-8.0.17.tar.bz2) = 11234855
+MD5 (postgresql/postgresql-8.0.19.tar.bz2) = 32e1f472b43b0bdf617ca112f7dcfcf3
+SHA256 (postgresql/postgresql-8.0.19.tar.bz2) = 8377daddca68532d5348d3232897afe84206998686d39c11b8799360098ed4f8
+SIZE (postgresql/postgresql-8.0.19.tar.bz2) = 11238188
 MD5 (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = 9fa75cd7b3f1cb913d2e6d310582a4bc
 SHA256 (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = f3a1849f2d527759ef721502cb445a435e072cc9be820c2e489c9e4a71c7adbe
 SIZE (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = 30555
-MD5 (postgresql/pg-8015-icu-xx-2008-06-11.diff.gz) = a83fd50d3373e300b02e05f4e30fb547
-SHA256 (postgresql/pg-8015-icu-xx-2008-06-11.diff.gz) = 50b5a9884500ab05dea373e5e9971575a405056d814a32cb20e24dc0fee8f22a
-SIZE (postgresql/pg-8015-icu-xx-2008-06-11.diff.gz) = 4596
+MD5 (postgresql/pg-8019-icu-xx-2008-11-03.diff.gz) = 76fa7d029bcdbb4705e48d394f87bd06
+SHA256 (postgresql/pg-8019-icu-xx-2008-11-03.diff.gz) = 089bd1f35c1ca6ac60565726d8d40914fe16a5ddb77c2a0ca9b80f64e064f936
+SIZE (postgresql/pg-8019-icu-xx-2008-11-03.diff.gz) = 4597
diff --git a/databases/postgresql80-server/files/pkg-message-server.in b/databases/postgresql80-server/files/pkg-message-server.in
index 5b8a1afdfda0..eec5eeba4433 100644
--- a/databases/postgresql80-server/files/pkg-message-server.in
+++ b/databases/postgresql80-server/files/pkg-message-server.in
@@ -28,7 +28,7 @@ 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
+%%PREFIX%%/etc/rc.d/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.
diff --git a/databases/postgresql80-server/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server
index eea08812b057..78a686554e73 100644
--- a/databases/postgresql80-server/pkg-plist-server
+++ b/databases/postgresql80-server/pkg-plist-server
@@ -197,6 +197,7 @@ share/postgresql/timezone/America/Argentina/Jujuy
 share/postgresql/timezone/America/Argentina/La_Rioja
 share/postgresql/timezone/America/Argentina/Mendoza
 share/postgresql/timezone/America/Argentina/Rio_Gallegos
+share/postgresql/timezone/America/Argentina/Salta
 share/postgresql/timezone/America/Argentina/San_Juan
 share/postgresql/timezone/America/Argentina/San_Luis
 share/postgresql/timezone/America/Argentina/Tucuman
@@ -312,6 +313,7 @@ share/postgresql/timezone/America/Resolute
 share/postgresql/timezone/America/Regina
 share/postgresql/timezone/America/Rio_Branco
 share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Santarem
 share/postgresql/timezone/America/Santiago
 share/postgresql/timezone/America/Santo_Domingo
 share/postgresql/timezone/America/Sao_Paulo
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index f2fbf8c3cb09..6b7a28f1912c 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.1.13
+PORTVERSION?=	8.1.14
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index 02eed06e3753..ec6c7edee623 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.1.13.tar.bz2) = fb88b45deeed02e8822fa0ed8e03aa13
-SHA256 (postgresql/postgresql-8.1.13.tar.bz2) = a537734da80f85c51ef72dd2d28bb2f64b73f63a727ef53a90211ccac2dcb1d1
-SIZE (postgresql/postgresql-8.1.13.tar.bz2) = 11744780
+MD5 (postgresql/postgresql-8.1.14.tar.bz2) = 1c820aa8e21b890340a79b1a261c65e3
+SHA256 (postgresql/postgresql-8.1.14.tar.bz2) = b793dc92b85d26f59f9f3098a2497614efe9a8f9a1f3472865c75d7108d04209
+SIZE (postgresql/postgresql-8.1.14.tar.bz2) = 11773020
 MD5 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 15916bf13b99702599ce70b6475f7d86
 SHA256 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 14ecc3809ce69f47c3460efee3fc7fce78f68802936650fc4e1132adffd41d1e
 SIZE (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 31203
diff --git a/databases/postgresql81-server/files/pkg-message-server.in b/databases/postgresql81-server/files/pkg-message-server.in
index cd6c42ed2090..54f397448198 100644
--- a/databases/postgresql81-server/files/pkg-message-server.in
+++ b/databases/postgresql81-server/files/pkg-message-server.in
@@ -31,7 +31,7 @@ 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
+%%PREFIX%%/etc/rc.d/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.
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 465d8385565d..bbb49c956ba9 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.9
+PORTVERSION?=	8.2.10
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index 13cac2cd7f15..9e12f135b9d0 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/postgresql-8.2.9.tar.bz2) = 579506cf91881f6ede67e3be98a47c37
-SHA256 (postgresql/postgresql-8.2.9.tar.bz2) = 95ea81e0fa00184a63dae960007be95200343b24dec6cdea41bc809db29f22c2
-SIZE (postgresql/postgresql-8.2.9.tar.bz2) = 12558265
+MD5 (postgresql/postgresql-8.2.10.tar.bz2) = dd054a111bd76938a96a81b029d3e527
+SHA256 (postgresql/postgresql-8.2.10.tar.bz2) = 3ae74e61bbedd3215fdc7e774e5d84346ddc621ff7c8c7f5455e84ecbbd47087
+SIZE (postgresql/postgresql-8.2.10.tar.bz2) = 12551773
diff --git a/databases/postgresql82-server/files/pkg-message-server.in b/databases/postgresql82-server/files/pkg-message-server.in
index cd6c42ed2090..54f397448198 100644
--- a/databases/postgresql82-server/files/pkg-message-server.in
+++ b/databases/postgresql82-server/files/pkg-message-server.in
@@ -31,7 +31,7 @@ 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
+%%PREFIX%%/etc/rc.d/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.
diff --git a/databases/postgresql82-server/pkg-plist-server b/databases/postgresql82-server/pkg-plist-server
index ad24d963eb03..9a7cea8566ff 100644
--- a/databases/postgresql82-server/pkg-plist-server
+++ b/databases/postgresql82-server/pkg-plist-server
@@ -310,6 +310,7 @@ share/postgresql/timezone/America/Regina
 share/postgresql/timezone/America/Resolute
 share/postgresql/timezone/America/Rio_Branco
 share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Santarem
 share/postgresql/timezone/America/Santiago
 share/postgresql/timezone/America/Santo_Domingo
 share/postgresql/timezone/America/Sao_Paulo
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index b00b988fd480..0c612c8cf613 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.3
+DISTVERSION?=	8.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index 76cffb2e60ff..fa3a3d40b2b7 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.3.3.tar.bz2) = 0ae4bd9620e84d3e08dcf923808d14d0
-SHA256 (postgresql/postgresql-8.3.3.tar.bz2) = e9406b93794dc4fd15b21e10512d2b694236d79b018d29b9ca86311d5cca2437
-SIZE (postgresql/postgresql-8.3.3.tar.bz2) = 14004538
+MD5 (postgresql/postgresql-8.3.4.tar.bz2) = c339b9d3c0c4add64c7a76640fc93744
+SHA256 (postgresql/postgresql-8.3.4.tar.bz2) = 121956d3f77ccb33e542554f564e298b134f9185721cf8610535f96a4f756dcf
+SIZE (postgresql/postgresql-8.3.4.tar.bz2) = 14037366
 MD5 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 94fb6634636cd36cb5fde449d76ece65
 SHA256 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = c7d77dafe78afcf2e92567c7cdfda45dcfe41ea71efb2e326ef4f7eb66ec416b
 SIZE (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 5302
diff --git a/databases/postgresql83-server/files/502.pgsql b/databases/postgresql83-server/files/502.pgsql
index acc1afe431cf..d2235e414cd2 100644
--- a/databases/postgresql83-server/files/502.pgsql
+++ b/databases/postgresql83-server/files/502.pgsql
@@ -18,9 +18,6 @@
 # daily_pgsql_backup_enable="YES" # do backup
 # daily_pgsql_vacuum_enable="YES" # do vacuum
 
-daily_pgsql_vacuum_enable="YES"
-daily_pgsql_backup_enable="NO"
-
 daily_pgsql_vacuum_args="-z"
 daily_pgsql_pgdump_args="-b -F c"
 # backupdir is relative to ~pgsql home directory unless it begins with a slash:
@@ -48,11 +45,11 @@ case "$daily_pgsql_backup_enable" in
 	# but this might not be where you want the backups...
 	if [ ! -d ${backupdir} ] ; then 
 	    echo Creating ${backupdir}
-	    mkdir ${backupdir}; chmod 700 ${backupdir}; chown pgsql ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
 	fi
 
 	echo
-	echo "PostgreSQL maintenance"
+	echo "PostgreSQL backups"
 
 	# Protect the data
 	umask 077
@@ -83,7 +80,7 @@ case "$daily_pgsql_vacuum_enable" in
     [Yy][Ee][Ss])
 
 	echo
-	echo "vacuuming..."
+	echo "PostgreSQL vacuum"
 	su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
 	if [ $? -gt 0 ]
 	then
diff --git a/databases/postgresql83-server/files/pkg-message-server.in b/databases/postgresql83-server/files/pkg-message-server.in
index cd6c42ed2090..54f397448198 100644
--- a/databases/postgresql83-server/files/pkg-message-server.in
+++ b/databases/postgresql83-server/files/pkg-message-server.in
@@ -31,7 +31,7 @@ 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
+%%PREFIX%%/etc/rc.d/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.
diff --git a/databases/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server
index 3b1a6f039a36..6b99d96fc86c 100644
--- a/databases/postgresql83-server/pkg-plist-server
+++ b/databases/postgresql83-server/pkg-plist-server
@@ -321,6 +321,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Resolute
 %%TZDATA%%share/postgresql/timezone/America/Rio_Branco
 %%TZDATA%%share/postgresql/timezone/America/Rosario
+%%TZDATA%%share/postgresql/timezone/America/Santarem
 %%TZDATA%%share/postgresql/timezone/America/Santiago
 %%TZDATA%%share/postgresql/timezone/America/Santo_Domingo
 %%TZDATA%%share/postgresql/timezone/America/Sao_Paulo
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index b00b988fd480..0c612c8cf613 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.3
+DISTVERSION?=	8.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index 76cffb2e60ff..fa3a3d40b2b7 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.3.3.tar.bz2) = 0ae4bd9620e84d3e08dcf923808d14d0
-SHA256 (postgresql/postgresql-8.3.3.tar.bz2) = e9406b93794dc4fd15b21e10512d2b694236d79b018d29b9ca86311d5cca2437
-SIZE (postgresql/postgresql-8.3.3.tar.bz2) = 14004538
+MD5 (postgresql/postgresql-8.3.4.tar.bz2) = c339b9d3c0c4add64c7a76640fc93744
+SHA256 (postgresql/postgresql-8.3.4.tar.bz2) = 121956d3f77ccb33e542554f564e298b134f9185721cf8610535f96a4f756dcf
+SIZE (postgresql/postgresql-8.3.4.tar.bz2) = 14037366
 MD5 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 94fb6634636cd36cb5fde449d76ece65
 SHA256 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = c7d77dafe78afcf2e92567c7cdfda45dcfe41ea71efb2e326ef4f7eb66ec416b
 SIZE (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 5302
diff --git a/databases/postgresql84-server/files/502.pgsql b/databases/postgresql84-server/files/502.pgsql
index acc1afe431cf..d2235e414cd2 100644
--- a/databases/postgresql84-server/files/502.pgsql
+++ b/databases/postgresql84-server/files/502.pgsql
@@ -18,9 +18,6 @@
 # daily_pgsql_backup_enable="YES" # do backup
 # daily_pgsql_vacuum_enable="YES" # do vacuum
 
-daily_pgsql_vacuum_enable="YES"
-daily_pgsql_backup_enable="NO"
-
 daily_pgsql_vacuum_args="-z"
 daily_pgsql_pgdump_args="-b -F c"
 # backupdir is relative to ~pgsql home directory unless it begins with a slash:
@@ -48,11 +45,11 @@ case "$daily_pgsql_backup_enable" in
 	# but this might not be where you want the backups...
 	if [ ! -d ${backupdir} ] ; then 
 	    echo Creating ${backupdir}
-	    mkdir ${backupdir}; chmod 700 ${backupdir}; chown pgsql ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
 	fi
 
 	echo
-	echo "PostgreSQL maintenance"
+	echo "PostgreSQL backups"
 
 	# Protect the data
 	umask 077
@@ -83,7 +80,7 @@ case "$daily_pgsql_vacuum_enable" in
     [Yy][Ee][Ss])
 
 	echo
-	echo "vacuuming..."
+	echo "PostgreSQL vacuum"
 	su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
 	if [ $? -gt 0 ]
 	then
diff --git a/databases/postgresql84-server/files/pkg-message-server.in b/databases/postgresql84-server/files/pkg-message-server.in
index cd6c42ed2090..54f397448198 100644
--- a/databases/postgresql84-server/files/pkg-message-server.in
+++ b/databases/postgresql84-server/files/pkg-message-server.in
@@ -31,7 +31,7 @@ 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
+%%PREFIX%%/etc/rc.d/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.
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index 3b1a6f039a36..6b99d96fc86c 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -321,6 +321,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Resolute
 %%TZDATA%%share/postgresql/timezone/America/Rio_Branco
 %%TZDATA%%share/postgresql/timezone/America/Rosario
+%%TZDATA%%share/postgresql/timezone/America/Santarem
 %%TZDATA%%share/postgresql/timezone/America/Santiago
 %%TZDATA%%share/postgresql/timezone/America/Santo_Domingo
 %%TZDATA%%share/postgresql/timezone/America/Sao_Paulo
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index b00b988fd480..0c612c8cf613 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.3
+DISTVERSION?=	8.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index 76cffb2e60ff..fa3a3d40b2b7 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.3.3.tar.bz2) = 0ae4bd9620e84d3e08dcf923808d14d0
-SHA256 (postgresql/postgresql-8.3.3.tar.bz2) = e9406b93794dc4fd15b21e10512d2b694236d79b018d29b9ca86311d5cca2437
-SIZE (postgresql/postgresql-8.3.3.tar.bz2) = 14004538
+MD5 (postgresql/postgresql-8.3.4.tar.bz2) = c339b9d3c0c4add64c7a76640fc93744
+SHA256 (postgresql/postgresql-8.3.4.tar.bz2) = 121956d3f77ccb33e542554f564e298b134f9185721cf8610535f96a4f756dcf
+SIZE (postgresql/postgresql-8.3.4.tar.bz2) = 14037366
 MD5 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 94fb6634636cd36cb5fde449d76ece65
 SHA256 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = c7d77dafe78afcf2e92567c7cdfda45dcfe41ea71efb2e326ef4f7eb66ec416b
 SIZE (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 5302
diff --git a/databases/postgresql90-server/files/502.pgsql b/databases/postgresql90-server/files/502.pgsql
index acc1afe431cf..d2235e414cd2 100644
--- a/databases/postgresql90-server/files/502.pgsql
+++ b/databases/postgresql90-server/files/502.pgsql
@@ -18,9 +18,6 @@
 # daily_pgsql_backup_enable="YES" # do backup
 # daily_pgsql_vacuum_enable="YES" # do vacuum
 
-daily_pgsql_vacuum_enable="YES"
-daily_pgsql_backup_enable="NO"
-
 daily_pgsql_vacuum_args="-z"
 daily_pgsql_pgdump_args="-b -F c"
 # backupdir is relative to ~pgsql home directory unless it begins with a slash:
@@ -48,11 +45,11 @@ case "$daily_pgsql_backup_enable" in
 	# but this might not be where you want the backups...
 	if [ ! -d ${backupdir} ] ; then 
 	    echo Creating ${backupdir}
-	    mkdir ${backupdir}; chmod 700 ${backupdir}; chown pgsql ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
 	fi
 
 	echo
-	echo "PostgreSQL maintenance"
+	echo "PostgreSQL backups"
 
 	# Protect the data
 	umask 077
@@ -83,7 +80,7 @@ case "$daily_pgsql_vacuum_enable" in
     [Yy][Ee][Ss])
 
 	echo
-	echo "vacuuming..."
+	echo "PostgreSQL vacuum"
 	su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
 	if [ $? -gt 0 ]
 	then
diff --git a/databases/postgresql90-server/files/pkg-message-server.in b/databases/postgresql90-server/files/pkg-message-server.in
index cd6c42ed2090..54f397448198 100644
--- a/databases/postgresql90-server/files/pkg-message-server.in
+++ b/databases/postgresql90-server/files/pkg-message-server.in
@@ -31,7 +31,7 @@ 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
+%%PREFIX%%/etc/rc.d/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.
diff --git a/databases/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server
index 3b1a6f039a36..6b99d96fc86c 100644
--- a/databases/postgresql90-server/pkg-plist-server
+++ b/databases/postgresql90-server/pkg-plist-server
@@ -321,6 +321,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Resolute
 %%TZDATA%%share/postgresql/timezone/America/Rio_Branco
 %%TZDATA%%share/postgresql/timezone/America/Rosario
+%%TZDATA%%share/postgresql/timezone/America/Santarem
 %%TZDATA%%share/postgresql/timezone/America/Santiago
 %%TZDATA%%share/postgresql/timezone/America/Santo_Domingo
 %%TZDATA%%share/postgresql/timezone/America/Sao_Paulo
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index b00b988fd480..0c612c8cf613 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.3
+DISTVERSION?=	8.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index 76cffb2e60ff..fa3a3d40b2b7 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.3.3.tar.bz2) = 0ae4bd9620e84d3e08dcf923808d14d0
-SHA256 (postgresql/postgresql-8.3.3.tar.bz2) = e9406b93794dc4fd15b21e10512d2b694236d79b018d29b9ca86311d5cca2437
-SIZE (postgresql/postgresql-8.3.3.tar.bz2) = 14004538
+MD5 (postgresql/postgresql-8.3.4.tar.bz2) = c339b9d3c0c4add64c7a76640fc93744
+SHA256 (postgresql/postgresql-8.3.4.tar.bz2) = 121956d3f77ccb33e542554f564e298b134f9185721cf8610535f96a4f756dcf
+SIZE (postgresql/postgresql-8.3.4.tar.bz2) = 14037366
 MD5 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 94fb6634636cd36cb5fde449d76ece65
 SHA256 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = c7d77dafe78afcf2e92567c7cdfda45dcfe41ea71efb2e326ef4f7eb66ec416b
 SIZE (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 5302
diff --git a/databases/postgresql91-server/files/502.pgsql b/databases/postgresql91-server/files/502.pgsql
index acc1afe431cf..d2235e414cd2 100644
--- a/databases/postgresql91-server/files/502.pgsql
+++ b/databases/postgresql91-server/files/502.pgsql
@@ -18,9 +18,6 @@
 # daily_pgsql_backup_enable="YES" # do backup
 # daily_pgsql_vacuum_enable="YES" # do vacuum
 
-daily_pgsql_vacuum_enable="YES"
-daily_pgsql_backup_enable="NO"
-
 daily_pgsql_vacuum_args="-z"
 daily_pgsql_pgdump_args="-b -F c"
 # backupdir is relative to ~pgsql home directory unless it begins with a slash:
@@ -48,11 +45,11 @@ case "$daily_pgsql_backup_enable" in
 	# but this might not be where you want the backups...
 	if [ ! -d ${backupdir} ] ; then 
 	    echo Creating ${backupdir}
-	    mkdir ${backupdir}; chmod 700 ${backupdir}; chown pgsql ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
 	fi
 
 	echo
-	echo "PostgreSQL maintenance"
+	echo "PostgreSQL backups"
 
 	# Protect the data
 	umask 077
@@ -83,7 +80,7 @@ case "$daily_pgsql_vacuum_enable" in
     [Yy][Ee][Ss])
 
 	echo
-	echo "vacuuming..."
+	echo "PostgreSQL vacuum"
 	su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
 	if [ $? -gt 0 ]
 	then
diff --git a/databases/postgresql91-server/files/pkg-message-server.in b/databases/postgresql91-server/files/pkg-message-server.in
index cd6c42ed2090..54f397448198 100644
--- a/databases/postgresql91-server/files/pkg-message-server.in
+++ b/databases/postgresql91-server/files/pkg-message-server.in
@@ -31,7 +31,7 @@ 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
+%%PREFIX%%/etc/rc.d/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.
diff --git a/databases/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server
index 3b1a6f039a36..6b99d96fc86c 100644
--- a/databases/postgresql91-server/pkg-plist-server
+++ b/databases/postgresql91-server/pkg-plist-server
@@ -321,6 +321,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Resolute
 %%TZDATA%%share/postgresql/timezone/America/Rio_Branco
 %%TZDATA%%share/postgresql/timezone/America/Rosario
+%%TZDATA%%share/postgresql/timezone/America/Santarem
 %%TZDATA%%share/postgresql/timezone/America/Santiago
 %%TZDATA%%share/postgresql/timezone/America/Santo_Domingo
 %%TZDATA%%share/postgresql/timezone/America/Sao_Paulo
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index b00b988fd480..0c612c8cf613 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.3
+DISTVERSION?=	8.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 76cffb2e60ff..fa3a3d40b2b7 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.3.3.tar.bz2) = 0ae4bd9620e84d3e08dcf923808d14d0
-SHA256 (postgresql/postgresql-8.3.3.tar.bz2) = e9406b93794dc4fd15b21e10512d2b694236d79b018d29b9ca86311d5cca2437
-SIZE (postgresql/postgresql-8.3.3.tar.bz2) = 14004538
+MD5 (postgresql/postgresql-8.3.4.tar.bz2) = c339b9d3c0c4add64c7a76640fc93744
+SHA256 (postgresql/postgresql-8.3.4.tar.bz2) = 121956d3f77ccb33e542554f564e298b134f9185721cf8610535f96a4f756dcf
+SIZE (postgresql/postgresql-8.3.4.tar.bz2) = 14037366
 MD5 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 94fb6634636cd36cb5fde449d76ece65
 SHA256 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = c7d77dafe78afcf2e92567c7cdfda45dcfe41ea71efb2e326ef4f7eb66ec416b
 SIZE (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 5302
diff --git a/databases/postgresql92-server/files/502.pgsql b/databases/postgresql92-server/files/502.pgsql
index acc1afe431cf..d2235e414cd2 100644
--- a/databases/postgresql92-server/files/502.pgsql
+++ b/databases/postgresql92-server/files/502.pgsql
@@ -18,9 +18,6 @@
 # daily_pgsql_backup_enable="YES" # do backup
 # daily_pgsql_vacuum_enable="YES" # do vacuum
 
-daily_pgsql_vacuum_enable="YES"
-daily_pgsql_backup_enable="NO"
-
 daily_pgsql_vacuum_args="-z"
 daily_pgsql_pgdump_args="-b -F c"
 # backupdir is relative to ~pgsql home directory unless it begins with a slash:
@@ -48,11 +45,11 @@ case "$daily_pgsql_backup_enable" in
 	# but this might not be where you want the backups...
 	if [ ! -d ${backupdir} ] ; then 
 	    echo Creating ${backupdir}
-	    mkdir ${backupdir}; chmod 700 ${backupdir}; chown pgsql ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
 	fi
 
 	echo
-	echo "PostgreSQL maintenance"
+	echo "PostgreSQL backups"
 
 	# Protect the data
 	umask 077
@@ -83,7 +80,7 @@ case "$daily_pgsql_vacuum_enable" in
     [Yy][Ee][Ss])
 
 	echo
-	echo "vacuuming..."
+	echo "PostgreSQL vacuum"
 	su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
 	if [ $? -gt 0 ]
 	then
diff --git a/databases/postgresql92-server/files/pkg-message-server.in b/databases/postgresql92-server/files/pkg-message-server.in
index cd6c42ed2090..54f397448198 100644
--- a/databases/postgresql92-server/files/pkg-message-server.in
+++ b/databases/postgresql92-server/files/pkg-message-server.in
@@ -31,7 +31,7 @@ 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
+%%PREFIX%%/etc/rc.d/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.
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index 3b1a6f039a36..6b99d96fc86c 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -321,6 +321,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Resolute
 %%TZDATA%%share/postgresql/timezone/America/Rio_Branco
 %%TZDATA%%share/postgresql/timezone/America/Rosario
+%%TZDATA%%share/postgresql/timezone/America/Santarem
 %%TZDATA%%share/postgresql/timezone/America/Santiago
 %%TZDATA%%share/postgresql/timezone/America/Santo_Domingo
 %%TZDATA%%share/postgresql/timezone/America/Sao_Paulo