Update all PostgreSQL to fix a security flaw

The PostgreSQL Global Development Group today released versions 8.1.4, 8.0.8,
7.4.13 and 7.3.15. This is an urgent update to close a security hole which
can permit a SQL injection attack on some applications running PostgreSQL.

Users are urged to apply the update as soon as reasonably possible. Since the
update affects client functionality, most driver projects will be updating
this week as well.

Because the security issue involved is complex, we have added a section in
Techdocs to explain it: http://www.postgresql.org/docs/techdocs.52. Please
read this first before applying the updates.

Also, fix rc_subr startup problems on FreeBSD-7.x.

Security:	http://www.postgresql.org/docs/techdocs.50
PR:		ports/95154

30 files changed, 150 insertions, 150 deletions

diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index e6b3afef4480..f9e78ea236ed 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	7.3.14
+PORTVERSION?=	7.3.15
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -212,7 +212,7 @@ post-build:
 .endif
 
 .if defined(SERVER_ONLY)
-pre-install:
+pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
diff --git a/databases/postgresql73-server/distinfo b/databases/postgresql73-server/distinfo
index 2b1463e75ba6..cd79a643d53a 100644
--- a/databases/postgresql73-server/distinfo
+++ b/databases/postgresql73-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-7.3.14.tar.bz2) = bb925420098bd7921a8684d7f279bc97
-SHA256 (postgresql/postgresql-base-7.3.14.tar.bz2) = 3476db5e5ad575c934a4e8804d3e9a088ac705688ab284de00135d91861142de
-SIZE (postgresql/postgresql-base-7.3.14.tar.bz2) = 5669000
-MD5 (postgresql/postgresql-docs-7.3.14.tar.bz2) = 94d403ab6d06efdc3c7925fd1f003d23
-SHA256 (postgresql/postgresql-docs-7.3.14.tar.bz2) = 39947cdd5f6215d5870add117bc04b29be8c17fe3c5e3ffc4d5e104c4d844e81
-SIZE (postgresql/postgresql-docs-7.3.14.tar.bz2) = 2352329
-MD5 (postgresql/postgresql-opt-7.3.14.tar.bz2) = 984035524d18c1597771b17b0ab440cb
-SHA256 (postgresql/postgresql-opt-7.3.14.tar.bz2) = 6be0aa520387b19d1ddb013a6e8b18b71be65a1addd1521e77509399bb3ae811
-SIZE (postgresql/postgresql-opt-7.3.14.tar.bz2) = 340579
-MD5 (postgresql/postgresql-test-7.3.14.tar.bz2) = 9f3fc8ddc7ad86548570403c8513831d
-SHA256 (postgresql/postgresql-test-7.3.14.tar.bz2) = 19696717f51662e097e497b03a265bd2b960b98f46b205875eb39e9933aeecdf
-SIZE (postgresql/postgresql-test-7.3.14.tar.bz2) = 908798
+MD5 (postgresql/postgresql-base-7.3.15.tar.bz2) = dd23ef0e9cbd1a9bca19f8ee66a021db
+SHA256 (postgresql/postgresql-base-7.3.15.tar.bz2) = 81da1ab6c3d9e19aef068cc1db81ca696771dfa5c8ff262bcb1bf977ac7429dc
+SIZE (postgresql/postgresql-base-7.3.15.tar.bz2) = 5695061
+MD5 (postgresql/postgresql-docs-7.3.15.tar.bz2) = 9d18a5262a3a9b8a2b2c7962645572ab
+SHA256 (postgresql/postgresql-docs-7.3.15.tar.bz2) = 832239ebdef5501a8b32f3d2b2f1684c2e9c18fa6cec0370e950b20a62f07cf9
+SIZE (postgresql/postgresql-docs-7.3.15.tar.bz2) = 2361345
+MD5 (postgresql/postgresql-opt-7.3.15.tar.bz2) = f70a6f9163e204a116f44e752f4695ca
+SHA256 (postgresql/postgresql-opt-7.3.15.tar.bz2) = 9b513f3bdd2d63579698ecc9226866ca72fe2e13fd9f0367a07c5041dd8386f6
+SIZE (postgresql/postgresql-opt-7.3.15.tar.bz2) = 341753
+MD5 (postgresql/postgresql-test-7.3.15.tar.bz2) = b809b30a3ade1e625f94a39ccc8322db
+SHA256 (postgresql/postgresql-test-7.3.15.tar.bz2) = 36a16d5c1421ce46fd3e802ce58342978f5952f9201fdce90187fe1b0b8adf1b
+SIZE (postgresql/postgresql-test-7.3.15.tar.bz2) = 889519
diff --git a/databases/postgresql73-server/files/pgsql.sh.tmpl b/databases/postgresql73-server/files/pgsql.sh.tmpl
index e6a538b409a2..d3014f580dc0 100644
--- a/databases/postgresql73-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql73-server/files/pgsql.sh.tmpl
@@ -22,6 +22,7 @@
 prefix=%%PREFIX%%
 
 . %%RC_SUBR%%
+command=${prefix}/bin/pg_ctl
 
 load_rc_config postgresql
 
@@ -34,7 +35,6 @@ postgresql_class=${postgresql_class:-"default"}
 
 name=postgresql
 rcvar=`set_rcvar`
-command=${prefix}/bin/pg_ctl
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 910a59aa56e0..f22311d6ec33 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	7.4.12
+PORTVERSION?=	7.4.13
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -215,7 +215,7 @@ post-build:
 .endif
 
 .if defined(SERVER_ONLY)
-pre-install:
+pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index 67d6a4e06995..3e97aec32b0d 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,12 +1,12 @@
-MD5 (postgresql/postgresql-base-7.4.12.tar.bz2) = 289b9cbb231bc0adb757641edd9508a8
-SHA256 (postgresql/postgresql-base-7.4.12.tar.bz2) = 9e458eb084bac7816204e5b887d97278c3ad639accd1610b8c51d77f830b259e
-SIZE (postgresql/postgresql-base-7.4.12.tar.bz2) = 6601251
-MD5 (postgresql/postgresql-docs-7.4.12.tar.bz2) = 79b0ac16295e5a72380320ed17ec42d2
-SHA256 (postgresql/postgresql-docs-7.4.12.tar.bz2) = 6b42b5ab28f87275121239fc30c87122d1e9b978a6081985547ebe1af861cf1f
-SIZE (postgresql/postgresql-docs-7.4.12.tar.bz2) = 2430951
-MD5 (postgresql/postgresql-opt-7.4.12.tar.bz2) = 02fbdaa2c9f625412e0e4b5d693c31e6
-SHA256 (postgresql/postgresql-opt-7.4.12.tar.bz2) = 9d4b69b348afe9e57d5567702400e64601ab3397e20567fee1bcf9fe2b8ab420
-SIZE (postgresql/postgresql-opt-7.4.12.tar.bz2) = 332088
-MD5 (postgresql/postgresql-test-7.4.12.tar.bz2) = 187e45252ad3f6ad6930e6463af00ddc
-SHA256 (postgresql/postgresql-test-7.4.12.tar.bz2) = c3fa336304b882576da7af54f2fe809bbebe81a1c83415c9325dc747c31e178d
-SIZE (postgresql/postgresql-test-7.4.12.tar.bz2) = 945802
+MD5 (postgresql/postgresql-base-7.4.13.tar.bz2) = 2e4574f84f6312909de87126bd2859f8
+SHA256 (postgresql/postgresql-base-7.4.13.tar.bz2) = 2e2fa6b1cf3fc7a66a58762acfb64ce42d358e0dd799a467316e937d3a116cf7
+SIZE (postgresql/postgresql-base-7.4.13.tar.bz2) = 6576973
+MD5 (postgresql/postgresql-docs-7.4.13.tar.bz2) = bad02bd460bccdcdc17c51c2ab555109
+SHA256 (postgresql/postgresql-docs-7.4.13.tar.bz2) = 31d91342f23dc842839ee9f5b7475582a2e232c6831c6d514c3a414ed28ebdf8
+SIZE (postgresql/postgresql-docs-7.4.13.tar.bz2) = 2426721
+MD5 (postgresql/postgresql-opt-7.4.13.tar.bz2) = 1c92e80c8d5296ea4bbd83ad378368c3
+SHA256 (postgresql/postgresql-opt-7.4.13.tar.bz2) = 8139a7161b2a55eba304b027896f0bfc81523dd41f7d1df222274b7a55e5aeab
+SIZE (postgresql/postgresql-opt-7.4.13.tar.bz2) = 333860
+MD5 (postgresql/postgresql-test-7.4.13.tar.bz2) = 5d5464968c4e0abac33e23e899f33810
+SHA256 (postgresql/postgresql-test-7.4.13.tar.bz2) = 41e391863aa4507333a0678a7d8c2811c8fe13f5b5e87331d47c44e81c8b0713
+SIZE (postgresql/postgresql-test-7.4.13.tar.bz2) = 901604
diff --git a/databases/postgresql74-server/files/pgsql.sh.tmpl b/databases/postgresql74-server/files/pgsql.sh.tmpl
index e6a538b409a2..d3014f580dc0 100644
--- a/databases/postgresql74-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql74-server/files/pgsql.sh.tmpl
@@ -22,6 +22,7 @@
 prefix=%%PREFIX%%
 
 . %%RC_SUBR%%
+command=${prefix}/bin/pg_ctl
 
 load_rc_config postgresql
 
@@ -34,7 +35,6 @@ postgresql_class=${postgresql_class:-"default"}
 
 name=postgresql
 rcvar=`set_rcvar`
-command=${prefix}/bin/pg_ctl
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index e39efa5714be..faf99235b07a 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.0.7
+PORTVERSION?=	8.0.8
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -273,7 +273,7 @@ post-build:
 .endif
 
 .if defined(SERVER_ONLY)
-pre-install:
+pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index 4adf74cf4a2e..f2dd703747ca 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.0.7.tar.bz2) = 8d15064ffa1da6ee6629a444f782c7dd
-SHA256 (postgresql/postgresql-base-8.0.7.tar.bz2) = 638c303d0b18cd37d41971fd79581c01e59f9aa200836e50dfce288139ced7ee
-SIZE (postgresql/postgresql-base-8.0.7.tar.bz2) = 7824746
-MD5 (postgresql/postgresql-docs-8.0.7.tar.bz2) = d8159d0cc01b35fec59d181d1d16a5e0
-SHA256 (postgresql/postgresql-docs-8.0.7.tar.bz2) = 75087a5a57e74c54dc06eeafbe2f74a5f0f33d0635d5f6fb21b51ccbd18b8e5e
-SIZE (postgresql/postgresql-docs-8.0.7.tar.bz2) = 2255231
-MD5 (postgresql/postgresql-opt-8.0.7.tar.bz2) = e18314b1d70f2b0bae83cc31b1aa3192
-SHA256 (postgresql/postgresql-opt-8.0.7.tar.bz2) = ac4deff14c8671d879e9dba824ed59bfea7038208b0d180737730e1f12544e34
-SIZE (postgresql/postgresql-opt-8.0.7.tar.bz2) = 134524
-MD5 (postgresql/postgresql-test-8.0.7.tar.bz2) = 71347619697dd170c499ae21e9d2e9e1
-SHA256 (postgresql/postgresql-test-8.0.7.tar.bz2) = 47469388db35fbd299b4ec2ba1af204366d01fdfbc82ea3f21b091a78ef3aba9
-SIZE (postgresql/postgresql-test-8.0.7.tar.bz2) = 958697
+MD5 (postgresql/postgresql-base-8.0.8.tar.bz2) = 4d84ff56ae9669b250060f9e2e36f788
+SHA256 (postgresql/postgresql-base-8.0.8.tar.bz2) = 906d86f2477309b9c2531d12fe720761fdffd73243a83ae31892bd7a0a618183
+SIZE (postgresql/postgresql-base-8.0.8.tar.bz2) = 7823046
+MD5 (postgresql/postgresql-docs-8.0.8.tar.bz2) = ba6fbc2dff64d385f86344daeb51cab1
+SHA256 (postgresql/postgresql-docs-8.0.8.tar.bz2) = 60a93ee5b2b80f517696328d85f4db24791cb1099d89a0adc375ee740201dc54
+SIZE (postgresql/postgresql-docs-8.0.8.tar.bz2) = 2260219
+MD5 (postgresql/postgresql-opt-8.0.8.tar.bz2) = e129cb889239da6c800a21be00a35da7
+SHA256 (postgresql/postgresql-opt-8.0.8.tar.bz2) = 427e82253b068b35e47235a1b78c521c89a9774b80dcc2433946f86220a34926
+SIZE (postgresql/postgresql-opt-8.0.8.tar.bz2) = 134600
+MD5 (postgresql/postgresql-test-8.0.8.tar.bz2) = d3ade4260a468aa0e5d3a373b9acf52e
+SHA256 (postgresql/postgresql-test-8.0.8.tar.bz2) = 804ee10063a6586d95418109aa3085dad0a1a2d00a0632d3c40629b840107a8f
+SIZE (postgresql/postgresql-test-8.0.8.tar.bz2) = 931549
 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
diff --git a/databases/postgresql80-server/files/pgsql.sh.tmpl b/databases/postgresql80-server/files/pgsql.sh.tmpl
index e6a538b409a2..d3014f580dc0 100644
--- a/databases/postgresql80-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql80-server/files/pgsql.sh.tmpl
@@ -22,6 +22,7 @@
 prefix=%%PREFIX%%
 
 . %%RC_SUBR%%
+command=${prefix}/bin/pg_ctl
 
 load_rc_config postgresql
 
@@ -34,7 +35,6 @@ postgresql_class=${postgresql_class:-"default"}
 
 name=postgresql
 rcvar=`set_rcvar`
-command=${prefix}/bin/pg_ctl
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index b4e46cea0f2b..606887781e88 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.1.3
+PORTVERSION?=	8.1.4
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -268,7 +268,7 @@ post-build:
 .endif
 
 .if defined(SERVER_ONLY)
-pre-install:
+pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index c6944c6e9105..85a91a28a5b5 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.1.3.tar.bz2) = 4b9466e42b7951d7ec7be4455f64b13f
-SHA256 (postgresql/postgresql-base-8.1.3.tar.bz2) = 39a776680997639a100ddbdc33128c210f610e7aadc114624d3d02fdd0350619
-SIZE (postgresql/postgresql-base-8.1.3.tar.bz2) = 8044411
-MD5 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 9ca0b7f6b4c2edcd51b9995d4e3a8a42
-SHA256 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 3aecc34a12e9f611ff83d109884bae90c28f0491cc11a372ae24f4b11a31e020
-SIZE (postgresql/postgresql-docs-8.1.3.tar.bz2) = 2467558
-MD5 (postgresql/postgresql-opt-8.1.3.tar.bz2) = ad1dd1d66c9c608180418375e36aafcb
-SHA256 (postgresql/postgresql-opt-8.1.3.tar.bz2) = 5f98160060e4fc78996c8b4312304fb4cc3ca4254a5be226cc3c4ff6ff2e5525
-SIZE (postgresql/postgresql-opt-8.1.3.tar.bz2) =  144608
-MD5 (postgresql/postgresql-test-8.1.3.tar.bz2) = 14c0e620442542dfb7807e6b41b67aec
-SHA256 (postgresql/postgresql-test-8.1.3.tar.bz2) = c92dea86e6568f883aca158bc3285e24aa0c750450b5275e1ec172e2cb812429
-SIZE (postgresql/postgresql-test-8.1.3.tar.bz2) =  969522
+MD5 (postgresql/postgresql-base-8.1.4.tar.bz2) = 7ba24eaa31237eb8713782508de4dec7
+SHA256 (postgresql/postgresql-base-8.1.4.tar.bz2) = 3d5e6cf4aa1593730c61676ffc4e3acbed73c0e13fb246035e54e4cf83fa60e1
+SIZE (postgresql/postgresql-base-8.1.4.tar.bz2) = 8040435
+MD5 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 5edc420b949a22d9960fc72609a24af3
+SHA256 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 1578423df71962e22fe94b1123db680983d4e2f82e5bbb4913d96d9f6265de7f
+SIZE (postgresql/postgresql-docs-8.1.4.tar.bz2) = 2485052
+MD5 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 6aad690bd918086cc3fbf673b74e65e6
+SHA256 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 5a6d27e303ad9b073f91e51658b13cfeb153e3d886af5e5c1093ea315e15738c
+SIZE (postgresql/postgresql-opt-8.1.4.tar.bz2) = 144696
+MD5 (postgresql/postgresql-test-8.1.4.tar.bz2) = a4918ec95fd589f8b1eeb0e3d704045c
+SHA256 (postgresql/postgresql-test-8.1.4.tar.bz2) = b7449222f9f4c3340d6d065914d10df1d4a8b13d63c967c9e65190812325b8d9
+SIZE (postgresql/postgresql-test-8.1.4.tar.bz2) = 946868
 MD5 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 2f93587700b3a3d2606076c014d82012
 SHA256 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 6270681788e3191aa043e4bda164927c3fdd3a817a5f81aa0f9e8be528ddd349
 SIZE (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 4003
diff --git a/databases/postgresql81-server/files/pgsql.sh.tmpl b/databases/postgresql81-server/files/pgsql.sh.tmpl
index e6a538b409a2..3456ed3d7282 100644
--- a/databases/postgresql81-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql81-server/files/pgsql.sh.tmpl
@@ -20,6 +20,7 @@
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
 prefix=%%PREFIX%%
+command=${prefix}/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -34,7 +35,6 @@ postgresql_class=${postgresql_class:-"default"}
 
 name=postgresql
 rcvar=`set_rcvar`
-command=${prefix}/bin/pg_ctl
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index b4e46cea0f2b..606887781e88 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.1.3
+PORTVERSION?=	8.1.4
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -268,7 +268,7 @@ post-build:
 .endif
 
 .if defined(SERVER_ONLY)
-pre-install:
+pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index c6944c6e9105..85a91a28a5b5 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.1.3.tar.bz2) = 4b9466e42b7951d7ec7be4455f64b13f
-SHA256 (postgresql/postgresql-base-8.1.3.tar.bz2) = 39a776680997639a100ddbdc33128c210f610e7aadc114624d3d02fdd0350619
-SIZE (postgresql/postgresql-base-8.1.3.tar.bz2) = 8044411
-MD5 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 9ca0b7f6b4c2edcd51b9995d4e3a8a42
-SHA256 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 3aecc34a12e9f611ff83d109884bae90c28f0491cc11a372ae24f4b11a31e020
-SIZE (postgresql/postgresql-docs-8.1.3.tar.bz2) = 2467558
-MD5 (postgresql/postgresql-opt-8.1.3.tar.bz2) = ad1dd1d66c9c608180418375e36aafcb
-SHA256 (postgresql/postgresql-opt-8.1.3.tar.bz2) = 5f98160060e4fc78996c8b4312304fb4cc3ca4254a5be226cc3c4ff6ff2e5525
-SIZE (postgresql/postgresql-opt-8.1.3.tar.bz2) =  144608
-MD5 (postgresql/postgresql-test-8.1.3.tar.bz2) = 14c0e620442542dfb7807e6b41b67aec
-SHA256 (postgresql/postgresql-test-8.1.3.tar.bz2) = c92dea86e6568f883aca158bc3285e24aa0c750450b5275e1ec172e2cb812429
-SIZE (postgresql/postgresql-test-8.1.3.tar.bz2) =  969522
+MD5 (postgresql/postgresql-base-8.1.4.tar.bz2) = 7ba24eaa31237eb8713782508de4dec7
+SHA256 (postgresql/postgresql-base-8.1.4.tar.bz2) = 3d5e6cf4aa1593730c61676ffc4e3acbed73c0e13fb246035e54e4cf83fa60e1
+SIZE (postgresql/postgresql-base-8.1.4.tar.bz2) = 8040435
+MD5 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 5edc420b949a22d9960fc72609a24af3
+SHA256 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 1578423df71962e22fe94b1123db680983d4e2f82e5bbb4913d96d9f6265de7f
+SIZE (postgresql/postgresql-docs-8.1.4.tar.bz2) = 2485052
+MD5 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 6aad690bd918086cc3fbf673b74e65e6
+SHA256 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 5a6d27e303ad9b073f91e51658b13cfeb153e3d886af5e5c1093ea315e15738c
+SIZE (postgresql/postgresql-opt-8.1.4.tar.bz2) = 144696
+MD5 (postgresql/postgresql-test-8.1.4.tar.bz2) = a4918ec95fd589f8b1eeb0e3d704045c
+SHA256 (postgresql/postgresql-test-8.1.4.tar.bz2) = b7449222f9f4c3340d6d065914d10df1d4a8b13d63c967c9e65190812325b8d9
+SIZE (postgresql/postgresql-test-8.1.4.tar.bz2) = 946868
 MD5 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 2f93587700b3a3d2606076c014d82012
 SHA256 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 6270681788e3191aa043e4bda164927c3fdd3a817a5f81aa0f9e8be528ddd349
 SIZE (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 4003
diff --git a/databases/postgresql82-server/files/pgsql.sh.tmpl b/databases/postgresql82-server/files/pgsql.sh.tmpl
index e6a538b409a2..3456ed3d7282 100644
--- a/databases/postgresql82-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql82-server/files/pgsql.sh.tmpl
@@ -20,6 +20,7 @@
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
 prefix=%%PREFIX%%
+command=${prefix}/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -34,7 +35,6 @@ postgresql_class=${postgresql_class:-"default"}
 
 name=postgresql
 rcvar=`set_rcvar`
-command=${prefix}/bin/pg_ctl
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index b4e46cea0f2b..606887781e88 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.1.3
+PORTVERSION?=	8.1.4
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -268,7 +268,7 @@ post-build:
 .endif
 
 .if defined(SERVER_ONLY)
-pre-install:
+pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index c6944c6e9105..85a91a28a5b5 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.1.3.tar.bz2) = 4b9466e42b7951d7ec7be4455f64b13f
-SHA256 (postgresql/postgresql-base-8.1.3.tar.bz2) = 39a776680997639a100ddbdc33128c210f610e7aadc114624d3d02fdd0350619
-SIZE (postgresql/postgresql-base-8.1.3.tar.bz2) = 8044411
-MD5 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 9ca0b7f6b4c2edcd51b9995d4e3a8a42
-SHA256 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 3aecc34a12e9f611ff83d109884bae90c28f0491cc11a372ae24f4b11a31e020
-SIZE (postgresql/postgresql-docs-8.1.3.tar.bz2) = 2467558
-MD5 (postgresql/postgresql-opt-8.1.3.tar.bz2) = ad1dd1d66c9c608180418375e36aafcb
-SHA256 (postgresql/postgresql-opt-8.1.3.tar.bz2) = 5f98160060e4fc78996c8b4312304fb4cc3ca4254a5be226cc3c4ff6ff2e5525
-SIZE (postgresql/postgresql-opt-8.1.3.tar.bz2) =  144608
-MD5 (postgresql/postgresql-test-8.1.3.tar.bz2) = 14c0e620442542dfb7807e6b41b67aec
-SHA256 (postgresql/postgresql-test-8.1.3.tar.bz2) = c92dea86e6568f883aca158bc3285e24aa0c750450b5275e1ec172e2cb812429
-SIZE (postgresql/postgresql-test-8.1.3.tar.bz2) =  969522
+MD5 (postgresql/postgresql-base-8.1.4.tar.bz2) = 7ba24eaa31237eb8713782508de4dec7
+SHA256 (postgresql/postgresql-base-8.1.4.tar.bz2) = 3d5e6cf4aa1593730c61676ffc4e3acbed73c0e13fb246035e54e4cf83fa60e1
+SIZE (postgresql/postgresql-base-8.1.4.tar.bz2) = 8040435
+MD5 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 5edc420b949a22d9960fc72609a24af3
+SHA256 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 1578423df71962e22fe94b1123db680983d4e2f82e5bbb4913d96d9f6265de7f
+SIZE (postgresql/postgresql-docs-8.1.4.tar.bz2) = 2485052
+MD5 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 6aad690bd918086cc3fbf673b74e65e6
+SHA256 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 5a6d27e303ad9b073f91e51658b13cfeb153e3d886af5e5c1093ea315e15738c
+SIZE (postgresql/postgresql-opt-8.1.4.tar.bz2) = 144696
+MD5 (postgresql/postgresql-test-8.1.4.tar.bz2) = a4918ec95fd589f8b1eeb0e3d704045c
+SHA256 (postgresql/postgresql-test-8.1.4.tar.bz2) = b7449222f9f4c3340d6d065914d10df1d4a8b13d63c967c9e65190812325b8d9
+SIZE (postgresql/postgresql-test-8.1.4.tar.bz2) = 946868
 MD5 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 2f93587700b3a3d2606076c014d82012
 SHA256 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 6270681788e3191aa043e4bda164927c3fdd3a817a5f81aa0f9e8be528ddd349
 SIZE (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 4003
diff --git a/databases/postgresql83-server/files/pgsql.sh.tmpl b/databases/postgresql83-server/files/pgsql.sh.tmpl
index e6a538b409a2..3456ed3d7282 100644
--- a/databases/postgresql83-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql83-server/files/pgsql.sh.tmpl
@@ -20,6 +20,7 @@
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
 prefix=%%PREFIX%%
+command=${prefix}/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -34,7 +35,6 @@ postgresql_class=${postgresql_class:-"default"}
 
 name=postgresql
 rcvar=`set_rcvar`
-command=${prefix}/bin/pg_ctl
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index b4e46cea0f2b..606887781e88 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.1.3
+PORTVERSION?=	8.1.4
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -268,7 +268,7 @@ post-build:
 .endif
 
 .if defined(SERVER_ONLY)
-pre-install:
+pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index c6944c6e9105..85a91a28a5b5 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.1.3.tar.bz2) = 4b9466e42b7951d7ec7be4455f64b13f
-SHA256 (postgresql/postgresql-base-8.1.3.tar.bz2) = 39a776680997639a100ddbdc33128c210f610e7aadc114624d3d02fdd0350619
-SIZE (postgresql/postgresql-base-8.1.3.tar.bz2) = 8044411
-MD5 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 9ca0b7f6b4c2edcd51b9995d4e3a8a42
-SHA256 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 3aecc34a12e9f611ff83d109884bae90c28f0491cc11a372ae24f4b11a31e020
-SIZE (postgresql/postgresql-docs-8.1.3.tar.bz2) = 2467558
-MD5 (postgresql/postgresql-opt-8.1.3.tar.bz2) = ad1dd1d66c9c608180418375e36aafcb
-SHA256 (postgresql/postgresql-opt-8.1.3.tar.bz2) = 5f98160060e4fc78996c8b4312304fb4cc3ca4254a5be226cc3c4ff6ff2e5525
-SIZE (postgresql/postgresql-opt-8.1.3.tar.bz2) =  144608
-MD5 (postgresql/postgresql-test-8.1.3.tar.bz2) = 14c0e620442542dfb7807e6b41b67aec
-SHA256 (postgresql/postgresql-test-8.1.3.tar.bz2) = c92dea86e6568f883aca158bc3285e24aa0c750450b5275e1ec172e2cb812429
-SIZE (postgresql/postgresql-test-8.1.3.tar.bz2) =  969522
+MD5 (postgresql/postgresql-base-8.1.4.tar.bz2) = 7ba24eaa31237eb8713782508de4dec7
+SHA256 (postgresql/postgresql-base-8.1.4.tar.bz2) = 3d5e6cf4aa1593730c61676ffc4e3acbed73c0e13fb246035e54e4cf83fa60e1
+SIZE (postgresql/postgresql-base-8.1.4.tar.bz2) = 8040435
+MD5 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 5edc420b949a22d9960fc72609a24af3
+SHA256 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 1578423df71962e22fe94b1123db680983d4e2f82e5bbb4913d96d9f6265de7f
+SIZE (postgresql/postgresql-docs-8.1.4.tar.bz2) = 2485052
+MD5 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 6aad690bd918086cc3fbf673b74e65e6
+SHA256 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 5a6d27e303ad9b073f91e51658b13cfeb153e3d886af5e5c1093ea315e15738c
+SIZE (postgresql/postgresql-opt-8.1.4.tar.bz2) = 144696
+MD5 (postgresql/postgresql-test-8.1.4.tar.bz2) = a4918ec95fd589f8b1eeb0e3d704045c
+SHA256 (postgresql/postgresql-test-8.1.4.tar.bz2) = b7449222f9f4c3340d6d065914d10df1d4a8b13d63c967c9e65190812325b8d9
+SIZE (postgresql/postgresql-test-8.1.4.tar.bz2) = 946868
 MD5 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 2f93587700b3a3d2606076c014d82012
 SHA256 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 6270681788e3191aa043e4bda164927c3fdd3a817a5f81aa0f9e8be528ddd349
 SIZE (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 4003
diff --git a/databases/postgresql84-server/files/pgsql.sh.tmpl b/databases/postgresql84-server/files/pgsql.sh.tmpl
index e6a538b409a2..3456ed3d7282 100644
--- a/databases/postgresql84-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql84-server/files/pgsql.sh.tmpl
@@ -20,6 +20,7 @@
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
 prefix=%%PREFIX%%
+command=${prefix}/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -34,7 +35,6 @@ postgresql_class=${postgresql_class:-"default"}
 
 name=postgresql
 rcvar=`set_rcvar`
-command=${prefix}/bin/pg_ctl
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index b4e46cea0f2b..606887781e88 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.1.3
+PORTVERSION?=	8.1.4
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -268,7 +268,7 @@ post-build:
 .endif
 
 .if defined(SERVER_ONLY)
-pre-install:
+pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index c6944c6e9105..85a91a28a5b5 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.1.3.tar.bz2) = 4b9466e42b7951d7ec7be4455f64b13f
-SHA256 (postgresql/postgresql-base-8.1.3.tar.bz2) = 39a776680997639a100ddbdc33128c210f610e7aadc114624d3d02fdd0350619
-SIZE (postgresql/postgresql-base-8.1.3.tar.bz2) = 8044411
-MD5 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 9ca0b7f6b4c2edcd51b9995d4e3a8a42
-SHA256 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 3aecc34a12e9f611ff83d109884bae90c28f0491cc11a372ae24f4b11a31e020
-SIZE (postgresql/postgresql-docs-8.1.3.tar.bz2) = 2467558
-MD5 (postgresql/postgresql-opt-8.1.3.tar.bz2) = ad1dd1d66c9c608180418375e36aafcb
-SHA256 (postgresql/postgresql-opt-8.1.3.tar.bz2) = 5f98160060e4fc78996c8b4312304fb4cc3ca4254a5be226cc3c4ff6ff2e5525
-SIZE (postgresql/postgresql-opt-8.1.3.tar.bz2) =  144608
-MD5 (postgresql/postgresql-test-8.1.3.tar.bz2) = 14c0e620442542dfb7807e6b41b67aec
-SHA256 (postgresql/postgresql-test-8.1.3.tar.bz2) = c92dea86e6568f883aca158bc3285e24aa0c750450b5275e1ec172e2cb812429
-SIZE (postgresql/postgresql-test-8.1.3.tar.bz2) =  969522
+MD5 (postgresql/postgresql-base-8.1.4.tar.bz2) = 7ba24eaa31237eb8713782508de4dec7
+SHA256 (postgresql/postgresql-base-8.1.4.tar.bz2) = 3d5e6cf4aa1593730c61676ffc4e3acbed73c0e13fb246035e54e4cf83fa60e1
+SIZE (postgresql/postgresql-base-8.1.4.tar.bz2) = 8040435
+MD5 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 5edc420b949a22d9960fc72609a24af3
+SHA256 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 1578423df71962e22fe94b1123db680983d4e2f82e5bbb4913d96d9f6265de7f
+SIZE (postgresql/postgresql-docs-8.1.4.tar.bz2) = 2485052
+MD5 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 6aad690bd918086cc3fbf673b74e65e6
+SHA256 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 5a6d27e303ad9b073f91e51658b13cfeb153e3d886af5e5c1093ea315e15738c
+SIZE (postgresql/postgresql-opt-8.1.4.tar.bz2) = 144696
+MD5 (postgresql/postgresql-test-8.1.4.tar.bz2) = a4918ec95fd589f8b1eeb0e3d704045c
+SHA256 (postgresql/postgresql-test-8.1.4.tar.bz2) = b7449222f9f4c3340d6d065914d10df1d4a8b13d63c967c9e65190812325b8d9
+SIZE (postgresql/postgresql-test-8.1.4.tar.bz2) = 946868
 MD5 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 2f93587700b3a3d2606076c014d82012
 SHA256 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 6270681788e3191aa043e4bda164927c3fdd3a817a5f81aa0f9e8be528ddd349
 SIZE (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 4003
diff --git a/databases/postgresql90-server/files/pgsql.sh.tmpl b/databases/postgresql90-server/files/pgsql.sh.tmpl
index e6a538b409a2..3456ed3d7282 100644
--- a/databases/postgresql90-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql90-server/files/pgsql.sh.tmpl
@@ -20,6 +20,7 @@
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
 prefix=%%PREFIX%%
+command=${prefix}/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -34,7 +35,6 @@ postgresql_class=${postgresql_class:-"default"}
 
 name=postgresql
 rcvar=`set_rcvar`
-command=${prefix}/bin/pg_ctl
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index b4e46cea0f2b..606887781e88 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.1.3
+PORTVERSION?=	8.1.4
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -268,7 +268,7 @@ post-build:
 .endif
 
 .if defined(SERVER_ONLY)
-pre-install:
+pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index c6944c6e9105..85a91a28a5b5 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.1.3.tar.bz2) = 4b9466e42b7951d7ec7be4455f64b13f
-SHA256 (postgresql/postgresql-base-8.1.3.tar.bz2) = 39a776680997639a100ddbdc33128c210f610e7aadc114624d3d02fdd0350619
-SIZE (postgresql/postgresql-base-8.1.3.tar.bz2) = 8044411
-MD5 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 9ca0b7f6b4c2edcd51b9995d4e3a8a42
-SHA256 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 3aecc34a12e9f611ff83d109884bae90c28f0491cc11a372ae24f4b11a31e020
-SIZE (postgresql/postgresql-docs-8.1.3.tar.bz2) = 2467558
-MD5 (postgresql/postgresql-opt-8.1.3.tar.bz2) = ad1dd1d66c9c608180418375e36aafcb
-SHA256 (postgresql/postgresql-opt-8.1.3.tar.bz2) = 5f98160060e4fc78996c8b4312304fb4cc3ca4254a5be226cc3c4ff6ff2e5525
-SIZE (postgresql/postgresql-opt-8.1.3.tar.bz2) =  144608
-MD5 (postgresql/postgresql-test-8.1.3.tar.bz2) = 14c0e620442542dfb7807e6b41b67aec
-SHA256 (postgresql/postgresql-test-8.1.3.tar.bz2) = c92dea86e6568f883aca158bc3285e24aa0c750450b5275e1ec172e2cb812429
-SIZE (postgresql/postgresql-test-8.1.3.tar.bz2) =  969522
+MD5 (postgresql/postgresql-base-8.1.4.tar.bz2) = 7ba24eaa31237eb8713782508de4dec7
+SHA256 (postgresql/postgresql-base-8.1.4.tar.bz2) = 3d5e6cf4aa1593730c61676ffc4e3acbed73c0e13fb246035e54e4cf83fa60e1
+SIZE (postgresql/postgresql-base-8.1.4.tar.bz2) = 8040435
+MD5 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 5edc420b949a22d9960fc72609a24af3
+SHA256 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 1578423df71962e22fe94b1123db680983d4e2f82e5bbb4913d96d9f6265de7f
+SIZE (postgresql/postgresql-docs-8.1.4.tar.bz2) = 2485052
+MD5 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 6aad690bd918086cc3fbf673b74e65e6
+SHA256 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 5a6d27e303ad9b073f91e51658b13cfeb153e3d886af5e5c1093ea315e15738c
+SIZE (postgresql/postgresql-opt-8.1.4.tar.bz2) = 144696
+MD5 (postgresql/postgresql-test-8.1.4.tar.bz2) = a4918ec95fd589f8b1eeb0e3d704045c
+SHA256 (postgresql/postgresql-test-8.1.4.tar.bz2) = b7449222f9f4c3340d6d065914d10df1d4a8b13d63c967c9e65190812325b8d9
+SIZE (postgresql/postgresql-test-8.1.4.tar.bz2) = 946868
 MD5 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 2f93587700b3a3d2606076c014d82012
 SHA256 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 6270681788e3191aa043e4bda164927c3fdd3a817a5f81aa0f9e8be528ddd349
 SIZE (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 4003
diff --git a/databases/postgresql91-server/files/pgsql.sh.tmpl b/databases/postgresql91-server/files/pgsql.sh.tmpl
index e6a538b409a2..3456ed3d7282 100644
--- a/databases/postgresql91-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql91-server/files/pgsql.sh.tmpl
@@ -20,6 +20,7 @@
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
 prefix=%%PREFIX%%
+command=${prefix}/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -34,7 +35,6 @@ postgresql_class=${postgresql_class:-"default"}
 
 name=postgresql
 rcvar=`set_rcvar`
-command=${prefix}/bin/pg_ctl
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index b4e46cea0f2b..606887781e88 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.1.3
+PORTVERSION?=	8.1.4
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -268,7 +268,7 @@ post-build:
 .endif
 
 .if defined(SERVER_ONLY)
-pre-install:
+pre-su-install:
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index c6944c6e9105..85a91a28a5b5 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.1.3.tar.bz2) = 4b9466e42b7951d7ec7be4455f64b13f
-SHA256 (postgresql/postgresql-base-8.1.3.tar.bz2) = 39a776680997639a100ddbdc33128c210f610e7aadc114624d3d02fdd0350619
-SIZE (postgresql/postgresql-base-8.1.3.tar.bz2) = 8044411
-MD5 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 9ca0b7f6b4c2edcd51b9995d4e3a8a42
-SHA256 (postgresql/postgresql-docs-8.1.3.tar.bz2) = 3aecc34a12e9f611ff83d109884bae90c28f0491cc11a372ae24f4b11a31e020
-SIZE (postgresql/postgresql-docs-8.1.3.tar.bz2) = 2467558
-MD5 (postgresql/postgresql-opt-8.1.3.tar.bz2) = ad1dd1d66c9c608180418375e36aafcb
-SHA256 (postgresql/postgresql-opt-8.1.3.tar.bz2) = 5f98160060e4fc78996c8b4312304fb4cc3ca4254a5be226cc3c4ff6ff2e5525
-SIZE (postgresql/postgresql-opt-8.1.3.tar.bz2) =  144608
-MD5 (postgresql/postgresql-test-8.1.3.tar.bz2) = 14c0e620442542dfb7807e6b41b67aec
-SHA256 (postgresql/postgresql-test-8.1.3.tar.bz2) = c92dea86e6568f883aca158bc3285e24aa0c750450b5275e1ec172e2cb812429
-SIZE (postgresql/postgresql-test-8.1.3.tar.bz2) =  969522
+MD5 (postgresql/postgresql-base-8.1.4.tar.bz2) = 7ba24eaa31237eb8713782508de4dec7
+SHA256 (postgresql/postgresql-base-8.1.4.tar.bz2) = 3d5e6cf4aa1593730c61676ffc4e3acbed73c0e13fb246035e54e4cf83fa60e1
+SIZE (postgresql/postgresql-base-8.1.4.tar.bz2) = 8040435
+MD5 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 5edc420b949a22d9960fc72609a24af3
+SHA256 (postgresql/postgresql-docs-8.1.4.tar.bz2) = 1578423df71962e22fe94b1123db680983d4e2f82e5bbb4913d96d9f6265de7f
+SIZE (postgresql/postgresql-docs-8.1.4.tar.bz2) = 2485052
+MD5 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 6aad690bd918086cc3fbf673b74e65e6
+SHA256 (postgresql/postgresql-opt-8.1.4.tar.bz2) = 5a6d27e303ad9b073f91e51658b13cfeb153e3d886af5e5c1093ea315e15738c
+SIZE (postgresql/postgresql-opt-8.1.4.tar.bz2) = 144696
+MD5 (postgresql/postgresql-test-8.1.4.tar.bz2) = a4918ec95fd589f8b1eeb0e3d704045c
+SHA256 (postgresql/postgresql-test-8.1.4.tar.bz2) = b7449222f9f4c3340d6d065914d10df1d4a8b13d63c967c9e65190812325b8d9
+SIZE (postgresql/postgresql-test-8.1.4.tar.bz2) = 946868
 MD5 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 2f93587700b3a3d2606076c014d82012
 SHA256 (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 6270681788e3191aa043e4bda164927c3fdd3a817a5f81aa0f9e8be528ddd349
 SIZE (postgresql/pg-812-icu-34-2006-01-09.diff.gz) = 4003
diff --git a/databases/postgresql92-server/files/pgsql.sh.tmpl b/databases/postgresql92-server/files/pgsql.sh.tmpl
index e6a538b409a2..3456ed3d7282 100644
--- a/databases/postgresql92-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql92-server/files/pgsql.sh.tmpl
@@ -20,6 +20,7 @@
 # For postmaster startup options, edit ${postgresql_data}/postgresql.conf
 
 prefix=%%PREFIX%%
+command=${prefix}/bin/pg_ctl
 
 . %%RC_SUBR%%
 
@@ -34,7 +35,6 @@ postgresql_class=${postgresql_class:-"default"}
 
 name=postgresql
 rcvar=`set_rcvar`
-command=${prefix}/bin/pg_ctl
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"