65 files changed, 390 insertions, 819 deletions

diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql-devel-server/distinfo b/databases/postgresql-devel-server/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql-devel-server/distinfo
+++ b/databases/postgresql-devel-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql-devel-server/pkg-message b/databases/postgresql-devel-server/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql-devel-server/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql-devel-server/pkg-message.client b/databases/postgresql-devel-server/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql-devel-server/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql-devel-server/pkg-message.server b/databases/postgresql-devel-server/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql-devel-server/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql7/distinfo b/databases/postgresql7/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql7/distinfo
+++ b/databases/postgresql7/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql7/pkg-message b/databases/postgresql7/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql7/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql7/pkg-message.client b/databases/postgresql7/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql7/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql7/pkg-message.server b/databases/postgresql7/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql7/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql73-server/distinfo b/databases/postgresql73-server/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql73-server/distinfo
+++ b/databases/postgresql73-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql73-server/pkg-message b/databases/postgresql73-server/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql73-server/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql73-server/pkg-message.client b/databases/postgresql73-server/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql73-server/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql73-server/pkg-message.server b/databases/postgresql73-server/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql73-server/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql73/distinfo b/databases/postgresql73/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql73/distinfo
+++ b/databases/postgresql73/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql73/pkg-message b/databases/postgresql73/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql73/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql73/pkg-message.client b/databases/postgresql73/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql73/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql73/pkg-message.server b/databases/postgresql73/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql73/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql74-server/pkg-message b/databases/postgresql74-server/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql74-server/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql74-server/pkg-message.client b/databases/postgresql74-server/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql74-server/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql74-server/pkg-message.server b/databases/postgresql74-server/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql74-server/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql80-server/pkg-message b/databases/postgresql80-server/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql80-server/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql80-server/pkg-message.client b/databases/postgresql80-server/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql80-server/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql80-server/pkg-message.server b/databases/postgresql80-server/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql80-server/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql81-server/pkg-message b/databases/postgresql81-server/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql81-server/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql81-server/pkg-message.client b/databases/postgresql81-server/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql81-server/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql81-server/pkg-message.server b/databases/postgresql81-server/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql81-server/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql82-server/pkg-message b/databases/postgresql82-server/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql82-server/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql82-server/pkg-message.client b/databases/postgresql82-server/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql82-server/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql82-server/pkg-message.server b/databases/postgresql82-server/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql82-server/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql83-server/pkg-message b/databases/postgresql83-server/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql83-server/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql83-server/pkg-message.client b/databases/postgresql83-server/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql83-server/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql83-server/pkg-message.server b/databases/postgresql83-server/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql83-server/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql84-server/pkg-message b/databases/postgresql84-server/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql84-server/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql84-server/pkg-message.client b/databases/postgresql84-server/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql84-server/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql84-server/pkg-message.server b/databases/postgresql84-server/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql84-server/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql90-server/pkg-message b/databases/postgresql90-server/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql90-server/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql90-server/pkg-message.client b/databases/postgresql90-server/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql90-server/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql90-server/pkg-message.server b/databases/postgresql90-server/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql90-server/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql91-server/pkg-message b/databases/postgresql91-server/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql91-server/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql91-server/pkg-message.client b/databases/postgresql91-server/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql91-server/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql91-server/pkg-message.server b/databases/postgresql91-server/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql91-server/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 3c781ee37849..5a77d2d1210b 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.3.3
-PORTREVISION?=	1
+PORTVERSION?=	7.3.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,10 +65,12 @@ CONFIGURE_ARGS+= "--with-openssl=${OPENSSLBASE}"
 .endif
 
 .if defined(WITHOUT_SERVER)
-PKGMESSAGE=	${PKGDIR}/pkg-message.client
 PLIST_SUB+=	SERVER="@comment "
 PKGNAMESUFFIX=	-client
+PKGMSG=		""
 .else
+PKGMESSAGE=	${FILESDIR}/pkg-message.server
+PKGMSG=		${PKGMESSAGE}
 PLIST_SUB+=	SERVER=""
 INSTALL_TARGET+= install-all-headers
 MAKEFILE=	GNUmakefile
@@ -139,15 +140,16 @@ pre-everything::
 	@${ECHO} "				still be used if already installed)"
 	@${ECHO} "	WITHOUT_GETTEXT		Skips building with support for"
 	@${ECHO} "				internationalized error messages"
-	@${ECHO} "	WITHOUT_SERVER		Installs the headers and libraries for"
-	@${ECHO} "				PostgreSQL clients"
+	@${ECHO} "	WITHOUT_SERVER		Don't install the server,"
+	@${ECHO} "                              only install binaries, headers and libs"
+	@${ECHO} "				for PostgreSQL clients"
 	@${ECHO} "	WITHOUT_SSL		Builds without OpenSSL support"
 	@${ECHO} "	WITH_MIT_KRB5		Builds with MIT's kerberos support"
 	@${ECHO} "	WITH_HEIMDAL_KRB5	Builds with Heimdal's kerberos support"
 	@${ECHO} "	WITH_OPTIMIZED_CFLAGS	Builds with compiler optimizations (-O3)"
 	@${ECHO} "	WITH_DEBUG		Builds with debugging symbols"
 	@${ECHO} "	WITH_TESTS		Allows the use of a \"check\" target"
-	@${ECHO} "				building the module"
+	@${ECHO} "				to run regression tests"
 	@${ECHO} "	WITH_LIBC_R		Link the binaries with libc_r."
 	@${ECHO} "				Needed to run plpython"
 	@${ECHO} ""
@@ -183,7 +185,7 @@ pre-install:
 
 post-install:
 	@ ${MKDIR} ${PREFIX}/share/postgresql ;\
-	${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
+	${CAT} ${FILESDIR}/post-install-notes ${PKGMSG} |\
 		${SED} "s|/usr/local|${PREFIX}|g" |\
 		tee ${PREFIX}/share/postgresql/post-install-notes
 .if !defined(WITHOUT_SERVER)
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index d95d2a295743..f97651c7ef11 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (postgresql/postgresql-base-7.3.3.tar.gz) = 4f5830d3effa8b00b22cc13597030b2f
-MD5 (postgresql/postgresql-opt-7.3.3.tar.gz) = b0b7f07c6bba1813b18e9901e481599d
-MD5 (postgresql/postgresql-docs-7.3.3.tar.gz) = 5009a3233f3ecf80369a5613298fbb8c
-MD5 (postgresql/postgresql-test-7.3.3.tar.gz) = d029272601b4d8bfac3b6be843f0064b
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
+MD5 (postgresql/postgresql-opt-7.3.4.tar.gz) = 3a0f0254bf9d6dccc61baa149c68ae75
+MD5 (postgresql/postgresql-docs-7.3.4.tar.gz) = 0144134674614e6b6a54103482f8acb2
+MD5 (postgresql/postgresql-test-7.3.4.tar.gz) = 7734ec70bb8e3d3bb3ba49e6dcee10e5
diff --git a/databases/postgresql92-server/pkg-message b/databases/postgresql92-server/pkg-message
deleted file mode 100644
index 8e08644cb473..000000000000
--- a/databases/postgresql92-server/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.1 installation from users' and
-ldconfig(8)'s PATHs.
-
-The pgsql user's home dir is /usr/local/pgsql by default, but can be
-changed with for example chpass(1). Datadir defaults to ~pgsql/data,
-but can be changed by modifying the ~pgsql/.profile script.
-
-======================================================================
-
-To initialize the database, you should run initdb as the "pgsql" user
-(if you want to use your locale for collation, edit ~pgsql/.profile
-and set the locale to your preference first).
-
-Example:
-
-  su -l pgsql -c initdb
-
-You can then start PostgreSQL by running:
-
-  /usr/local/etc/rc.d/010.pgsql.sh start
-
-For postmaster settings, see ~pgsql/data/postgresql.conf
-For more tips, read ~pgsql/post-install-notes
-======================================================================
diff --git a/databases/postgresql92-server/pkg-message.client b/databases/postgresql92-server/pkg-message.client
deleted file mode 100644
index 720193b9d17c..000000000000
--- a/databases/postgresql92-server/pkg-message.client
+++ /dev/null
@@ -1,16 +0,0 @@
-======================================================================
-
-      * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE *
-
-The PostgreSQL port now obeys hier(7) by default, which means that it
-installs into:
-
-/usr/local/bin
-/usr/local/lib
-/usr/local/include  (NOTE! Changed again in 7.2, since PostgreSQL
-                           handles standard install nowadays)
-
-You *must* move away your pre-7.2 installation from users' and
-ldconfig(8)'s PATHs.
-
-======================================================================
diff --git a/databases/postgresql92-server/pkg-message.server b/databases/postgresql92-server/pkg-message.server
new file mode 100644
index 000000000000..6027012da44c
--- /dev/null
+++ b/databases/postgresql92-server/pkg-message.server
@@ -0,0 +1,17 @@
+======================================================================
+
+To initialize the database, you should run initdb as the "pgsql" user
+(if you want to use your locale for collation, edit ~pgsql/.profile
+and set the locale to your preference first).
+
+Example:
+
+  su -l pgsql -c initdb
+
+You can then start PostgreSQL by running:
+
+  /usr/local/etc/rc.d/010.pgsql.sh start
+
+For postmaster settings, see ~pgsql/data/postgresql.conf
+For more tips, read ~pgsql/post-install-notes
+======================================================================