diff --git a/UPDATING b/UPDATING
index ffa1f00d71ac..49bda9c82b73 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,13 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20061108
+  AFFECTS: Users of databases/postgresql*-server
+  AUTHOR: Palle Girgensohn <girgen@FreeBSD.org>
+
+  With the latest patch release of the PostgreSQL ports, the rc script
+  is renamed `postgresql'.
+
 20061106
   AFFECTS: Users of net/freeradius
   AUTHOR: David Wood <david@wood2.org.uk>
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index fade554de2ed..69698681c062 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME?=	postgresql
-PKGNAMESUFFIX?=	-server
-PORTVERSION?=	7.3.15
-PORTREVISION?=	1
+PORTVERSION?=	7.3.16
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
+PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
@@ -46,12 +46,11 @@ PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/backend src/backend/utils/mb/conversion_procs src/pl
 INSTALL_DIRS?=	${BUILD_DIRS}
-PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
-USE_RC_SUBR=	yes
-RCSCRIPT=	${PREFIX}/etc/rc.d/010.pgsql.sh
+USE_RC_SUBR=	postgresql
+SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
@@ -141,11 +140,15 @@ CONFIGURE_ARGS+=--with-krb5=${LOCALBASE}
 .    endif
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_TESTS)
+.  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
 .  endif
 
+.  ifmake makesum
+DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
+.  endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
@@ -203,11 +206,9 @@ do-build:
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
-.  if exists(${MASTERDIR}/pkg-message${PKGNAMESUFFIX})
-post-build:
-	@ ${SED} "s|/usr/local|${PREFIX}|g" \
-		< ${MASTERDIR}/pkg-message${PKGNAMESUFFIX} \
-		> ${PKGMESSAGE}
+.  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
+SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
+PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
@@ -228,20 +229,13 @@ do-install:
 .  elif defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
-	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
-		< ${FILESDIR}/dot.$i.in \
-		> ${PREFIX}/share/postgresql/dot.$i.dist; \
-	${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/; \
+	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
+	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
-		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
+		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
-	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g" \
-		< ${FILESDIR}/pgsql.sh.tmpl \
-		> ${RCSCRIPT} ;\
-	${CHMOD} 555 ${RCSCRIPT} ;\
-	${CHOWN} root:pgsql ${RCSCRIPT} ;\
-	${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
+	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
diff --git a/databases/postgresql73-server/distinfo b/databases/postgresql73-server/distinfo
index cd79a643d53a..cd2c22fb5a68 100644
--- a/databases/postgresql73-server/distinfo
+++ b/databases/postgresql73-server/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (postgresql/postgresql-base-7.3.16.tar.bz2) = ae269400f68118233e9e65b4c2c93a68
+SHA256 (postgresql/postgresql-base-7.3.16.tar.bz2) = 96046fc13596e4d9f7a4dcd5882fed51ec5905760cc828594443272a69c140e5
+SIZE (postgresql/postgresql-base-7.3.16.tar.bz2) = 5696231
+MD5 (postgresql/postgresql-opt-7.3.16.tar.bz2) = 8025d8314993b9e57d0f308e01c37b40
+SHA256 (postgresql/postgresql-opt-7.3.16.tar.bz2) = 0e1ab00b1439c5930b6c74ed5c4382c01fdb54434857ac3c1599d32fcce2c8d1
+SIZE (postgresql/postgresql-opt-7.3.16.tar.bz2) = 341908
+MD5 (postgresql/postgresql-test-7.3.16.tar.bz2) = 9da7ff0ef77b87053804838a1f40f15a
+SHA256 (postgresql/postgresql-test-7.3.16.tar.bz2) = 5844984770b326cfc62580d88f878196e304867fa339925fef20c017bb298d56
+SIZE (postgresql/postgresql-test-7.3.16.tar.bz2) = 891104
+MD5 (postgresql/postgresql-docs-7.3.16.tar.bz2) = 12123bfca15f077260a6fbcd952abbf2
+SHA256 (postgresql/postgresql-docs-7.3.16.tar.bz2) = 2d8cc0d745a3f8edd773a06c462f98c143388060feb1775e97ecf85bb5260b2f
+SIZE (postgresql/postgresql-docs-7.3.16.tar.bz2) = 2361886
diff --git a/databases/postgresql73-server/pkg-message-client b/databases/postgresql73-server/files/pkg-message-client.in
similarity index 100%
rename from databases/postgresql73-server/pkg-message-client
rename to databases/postgresql73-server/files/pkg-message-client.in
diff --git a/databases/postgresql73-server/pkg-message-contrib b/databases/postgresql73-server/files/pkg-message-contrib.in
similarity index 64%
rename from databases/postgresql73-server/pkg-message-contrib
rename to databases/postgresql73-server/files/pkg-message-contrib.in
index 8120f2d8d89c..2b29ffd33041 100644
--- a/databases/postgresql73-server/pkg-message-contrib
+++ b/databases/postgresql73-server/files/pkg-message-contrib.in
@@ -1,3 +1,3 @@
 The PostgreSQL contrib utilities have been installed. Please see
-/usr/local/share/doc/postgresql/contrib/README
+%%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
diff --git a/databases/postgresql73-server/pkg-message-plperl b/databases/postgresql73-server/files/pkg-message-plperl.in
similarity index 100%
rename from databases/postgresql73-server/pkg-message-plperl
rename to databases/postgresql73-server/files/pkg-message-plperl.in
diff --git a/databases/postgresql73-server/pkg-message-plpython b/databases/postgresql73-server/files/pkg-message-plpython.in
similarity index 100%
rename from databases/postgresql73-server/pkg-message-plpython
rename to databases/postgresql73-server/files/pkg-message-plpython.in
diff --git a/databases/postgresql73-server/pkg-message-pltcl b/databases/postgresql73-server/files/pkg-message-pltcl.in
similarity index 100%
rename from databases/postgresql73-server/pkg-message-pltcl
rename to databases/postgresql73-server/files/pkg-message-pltcl.in
diff --git a/databases/postgresql73-server/pkg-message-server b/databases/postgresql73-server/files/pkg-message-server.in
similarity index 72%
rename from databases/postgresql73-server/pkg-message-server
rename to databases/postgresql73-server/files/pkg-message-server.in
index 6c8dea2f813a..6e0beb0d5698 100644
--- a/databases/postgresql73-server/pkg-message-server
+++ b/databases/postgresql73-server/files/pkg-message-server.in
@@ -9,7 +9,7 @@ kern.maxfiles using sysctl(8), or reconfigure your kernel
 appropriately.
 
 You should vacuum and backup your database regularly. There is a
-periodic script, /usr/local/etc/periodic/daily/502.pgsql, that you may
+periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that you may
 find useful. See the script for instructions.
 
 To allow many simultaneous connections to your PostgreSQL server, you
@@ -26,18 +26,30 @@ postgresql.conf also needed, of course):
   options         SEMMNU=120
 
 If you plan to access your PostgreSQL server using ODBC, please
-consider running the SQL script /usr/local/share/postgresql/odbc.sql
+consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
 to get the functions required for ODBC compliance.
 
+If you need to store any characters besides strict ASCII in your
+database, you will want to set a character set, and possibly a
+collation locale, before initializing the database. Add something
+similar to this to /etc/login.conf:
+---
+postgres:\
+	:setenv=LC_ALL=en_US.UTF-8,LC_COLLATE=C:\
+	:tc=default:
+---
+and run `cap_mkdb /etc/login.conf'.
+Then add 'postgresql_class="postgres"' to /etc/rc.conf.
+
 ======================================================================
 
 To initialize the database, run
 
-  /usr/local/etc/rc.d/010.pgsql.sh initdb
+  %%PREFIX%%/etc/rc.d/010.pgsql.sh initdb
 
 You can then start PostgreSQL by running:
 
-  /usr/local/etc/rc.d/010.pgsql.sh start
+  %%PREFIX%%/etc/rc.d/010.pgsql.sh start
 
 For postmaster settings, see ~pgsql/data/postgresql.conf
 
diff --git a/databases/postgresql73-server/files/pgsql.sh.tmpl b/databases/postgresql73-server/files/postgresql.in
similarity index 100%
rename from databases/postgresql73-server/files/pgsql.sh.tmpl
rename to databases/postgresql73-server/files/postgresql.in
diff --git a/databases/postgresql73-server/pkg-plist-server b/databases/postgresql73-server/pkg-plist-server
index 795f41b84f87..504314f05398 100644
--- a/databases/postgresql73-server/pkg-plist-server
+++ b/databases/postgresql73-server/pkg-plist-server
@@ -1,7 +1,6 @@
 bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
-etc/rc.d/010.pgsql.sh
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/euc_cn_and_mic.so
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 039b8160a4bd..09f99f0a4974 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME?=	postgresql
-PKGNAMESUFFIX?=	-server
-PORTVERSION?=	7.4.13
-PORTREVISION?=	1
+PORTVERSION?=	7.4.14
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
+PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
@@ -46,12 +46,11 @@ PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/backend src/backend/utils/mb/conversion_procs src/pl
 INSTALL_DIRS?=	${BUILD_DIRS}
-PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
-USE_RC_SUBR=	yes
-RCSCRIPT=	${PREFIX}/etc/rc.d/010.pgsql.sh
+USE_RC_SUBR=	postgresql
+SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
@@ -87,6 +86,15 @@ OPTIONS+=	LIBC_R "Link w/ libc_r, used by plpython (server)" off
 OPTIONS+=	TESTS "Allows the use of a \"check\" target (server)" off
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
 
+# See http://gppl.moonbone.ru/ for more info
+OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
+
+.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
+PATCH_SITES+=	http://gppl.moonbone.ru/:hier74053
+PATCHFILES+=	hier-Pg7.4-0.5.3.tar.gz:hier74053
+USE_BISON=	yes
+.  endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
@@ -136,16 +144,20 @@ CONFIGURE_ARGS+=--with-krb5=${HEIMDAL_HOME}
 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
 # so we always use the heimdal port. See
 # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+=	krb5.20:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=	krb5.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5=${LOCALBASE}
 .    endif
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_TESTS)
+.  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
 .  endif
 
+.  ifmake makesum
+DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
+.  endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
@@ -206,11 +218,9 @@ do-build:
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
-.  if exists(${MASTERDIR}/pkg-message${PKGNAMESUFFIX})
-post-build:
-	@ ${SED} "s|/usr/local|${PREFIX}|g" \
-		< ${MASTERDIR}/pkg-message${PKGNAMESUFFIX} \
-		> ${PKGMESSAGE}
+.  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
+SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
+PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
@@ -231,20 +241,13 @@ do-install:
 .  elif defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
-	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
-		< ${FILESDIR}/dot.$i.in \
-		> ${PREFIX}/share/postgresql/dot.$i.dist; \
-	${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/; \
+	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
+	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
-		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
+		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
-	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g" \
-		< ${FILESDIR}/pgsql.sh.tmpl \
-		> ${RCSCRIPT} ;\
-	${CHMOD} 555 ${RCSCRIPT} ;\
-	${CHOWN} root:pgsql ${RCSCRIPT} ;\
-	${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
+	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index 3e97aec32b0d..44f032884865 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,12 +1,15 @@
-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
+MD5 (postgresql/postgresql-base-7.4.14.tar.bz2) = 8fb231e5cdf7fe4d8954edaa63fd9410
+SHA256 (postgresql/postgresql-base-7.4.14.tar.bz2) = 5a34fcd56d2d8eebcd2728e5971c0d39d2971dc25e49d88bfeb84d69b5e8ebc9
+SIZE (postgresql/postgresql-base-7.4.14.tar.bz2) = 6575201
+MD5 (postgresql/postgresql-opt-7.4.14.tar.bz2) = 5ad27f2d9673dcabaaad7729a6838cc2
+SHA256 (postgresql/postgresql-opt-7.4.14.tar.bz2) = e670d22812c50512807edd692d867e2b62c6b79f9d7b84cad56ef038cc12475d
+SIZE (postgresql/postgresql-opt-7.4.14.tar.bz2) = 333417
+MD5 (postgresql/postgresql-test-7.4.14.tar.bz2) = 3e7fccb8c02e4b4c2822ea5e5d054f07
+SHA256 (postgresql/postgresql-test-7.4.14.tar.bz2) = 39c87c0227f8c757d29141bb8c24e2a95d3a06d9bc459667fdee4d0028d6d12d
+SIZE (postgresql/postgresql-test-7.4.14.tar.bz2) = 902074
+MD5 (postgresql/postgresql-docs-7.4.14.tar.bz2) = 213c668f072aa56c77f85a23d11ad0ab
+SHA256 (postgresql/postgresql-docs-7.4.14.tar.bz2) = 6739dcb6876e1f76933f88feae0b7d0a5e528e9677dac4175e3223ef379ed789
+SIZE (postgresql/postgresql-docs-7.4.14.tar.bz2) = 2427724
+MD5 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 16d037213b879963724da7809a0a1589
+SHA256 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 1e56f76560c86227b08faabf78e3a53de4188c6a8f9d1f38b1481427e8fdf74c
+SIZE (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 34662
diff --git a/databases/postgresql74-server/pkg-message-client b/databases/postgresql74-server/files/pkg-message-client.in
similarity index 100%
rename from databases/postgresql74-server/pkg-message-client
rename to databases/postgresql74-server/files/pkg-message-client.in
diff --git a/databases/postgresql80-server/pkg-message-contrib b/databases/postgresql74-server/files/pkg-message-contrib.in
similarity index 64%
rename from databases/postgresql80-server/pkg-message-contrib
rename to databases/postgresql74-server/files/pkg-message-contrib.in
index 8120f2d8d89c..2b29ffd33041 100644
--- a/databases/postgresql80-server/pkg-message-contrib
+++ b/databases/postgresql74-server/files/pkg-message-contrib.in
@@ -1,3 +1,3 @@
 The PostgreSQL contrib utilities have been installed. Please see
-/usr/local/share/doc/postgresql/contrib/README
+%%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
diff --git a/databases/postgresql74-server/pkg-message-plperl b/databases/postgresql74-server/files/pkg-message-plperl.in
similarity index 100%
rename from databases/postgresql74-server/pkg-message-plperl
rename to databases/postgresql74-server/files/pkg-message-plperl.in
diff --git a/databases/postgresql74-server/pkg-message-plpython b/databases/postgresql74-server/files/pkg-message-plpython.in
similarity index 100%
rename from databases/postgresql74-server/pkg-message-plpython
rename to databases/postgresql74-server/files/pkg-message-plpython.in
diff --git a/databases/postgresql74-server/pkg-message-pltcl b/databases/postgresql74-server/files/pkg-message-pltcl.in
similarity index 100%
rename from databases/postgresql74-server/pkg-message-pltcl
rename to databases/postgresql74-server/files/pkg-message-pltcl.in
diff --git a/databases/postgresql74-server/pkg-message-server b/databases/postgresql74-server/files/pkg-message-server.in
similarity index 78%
rename from databases/postgresql74-server/pkg-message-server
rename to databases/postgresql74-server/files/pkg-message-server.in
index 3e66f3a2d797..5378c0d7adfd 100644
--- a/databases/postgresql74-server/pkg-message-server
+++ b/databases/postgresql74-server/files/pkg-message-server.in
@@ -10,7 +10,7 @@ Specific for updating 7.4.1->7.4.x:
    template1) as a superuser in psql, after installing the new release:
 
 DROP SCHEMA information_schema CASCADE;
-\i /usr/local/pgsql/share/information_schema.sql
+\i %%PREFIX%%/pgsql/share/information_schema.sql
 
    Fixes to the information schema (from HISTORY):
      * Fix information schema for bit data types (Peter)
@@ -29,7 +29,7 @@ kern.maxfiles using sysctl(8), or reconfigure your kernel
 appropriately.
 
 You should vacuum and backup your database regularly. There is a
-periodic script, /usr/local/etc/periodic/daily/502.pgsql, that you may
+periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that you may
 find useful. See the script for instructions.
 
 To allow many simultaneous connections to your PostgreSQL server, you
@@ -46,18 +46,30 @@ postgresql.conf also needed, of course):
   options         SEMMNU=120
 
 If you plan to access your PostgreSQL server using ODBC, please
-consider running the SQL script /usr/local/share/postgresql/odbc.sql
+consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
 to get the functions required for ODBC compliance.
 
+If you need to store any characters besides strict ASCII in your
+database, you will want to set a character set, and possibly a
+collation locale, before initializing the database. Add something
+similar to this to /etc/login.conf:
+---
+postgres:\
+	:setenv=LC_ALL=en_US.UTF-8,LC_COLLATE=C:\
+	:tc=default:
+---
+and run `cap_mkdb /etc/login.conf'.
+Then add 'postgresql_class="postgres"' to /etc/rc.conf.
+
 ======================================================================
 
 To initialize the database, run
 
-  /usr/local/etc/rc.d/010.pgsql.sh initdb
+  %%PREFIX%%/etc/rc.d/010.pgsql.sh initdb
 
 You can then start PostgreSQL by running:
 
-  /usr/local/etc/rc.d/010.pgsql.sh start
+  %%PREFIX%%/etc/rc.d/010.pgsql.sh start
 
 For postmaster settings, see ~pgsql/data/postgresql.conf
 
diff --git a/databases/postgresql74-server/pkg-message-tcltk b/databases/postgresql74-server/files/pkg-message-tcltk.in
similarity index 100%
rename from databases/postgresql74-server/pkg-message-tcltk
rename to databases/postgresql74-server/files/pkg-message-tcltk.in
diff --git a/databases/postgresql74-server/files/pgsql.sh.tmpl b/databases/postgresql74-server/files/postgresql.in
similarity index 100%
rename from databases/postgresql74-server/files/pgsql.sh.tmpl
rename to databases/postgresql74-server/files/postgresql.in
diff --git a/databases/postgresql74-server/pkg-plist-server b/databases/postgresql74-server/pkg-plist-server
index 32b27790c8b1..190ae7c376f2 100644
--- a/databases/postgresql74-server/pkg-plist-server
+++ b/databases/postgresql74-server/pkg-plist-server
@@ -1,7 +1,6 @@
 bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
-etc/rc.d/010.pgsql.sh
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/euc_cn_and_mic.so
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index d2d2961ce1c2..a4dc54058ea0 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME?=	postgresql
-PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.0.8
-PORTREVISION?=	1
+PORTVERSION?=	8.0.9
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
+PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
-CONFLICTS?=	${PORTNAME}-client-7.[0-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-7.[0-9]* \
+CONFLICTS?=	${PORTNAME}-client-7.* \
+		${PORTNAME}${PKGNAMESUFFIX}-7.* \
 		${PORTNAME}-client-8.[1-9]* \
 		${PORTNAME}${PKGNAMESUFFIX}-8.[1-9]*
 
@@ -48,12 +48,11 @@ PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/pl src/utils
 INSTALL_DIRS?=	${BUILD_DIRS}
-PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
-USE_RC_SUBR=	yes
-RCSCRIPT=	${PREFIX}/etc/rc.d/010.pgsql.sh
+USE_RC_SUBR=	postgresql
+SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
@@ -75,7 +74,7 @@ CONFIGURE_ARGS+=--with-openssl
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
-BROKEN=		"Coredump during build on alpha 4.x"
+BROKEN=		Coredump during build on alpha 4.x
 .endif
 
 .if !defined(SLAVE_ONLY)
@@ -103,13 +102,13 @@ OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-.  if defined(SERVER_ONLY) && defined(WITH_HIER)
+.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
 PATCH_SITES+=	http://gppl.moonbone.ru/:hier801055
 PATCHFILES+=	hier-Pg8.0.3-0.5.5.diff.gz:hier801055
 USE_BISON=	yes
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_ICU)
+.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 USE_AUTOTOOLS=	autoconf:253
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
@@ -117,6 +116,10 @@ PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 PATCHFILES+=	pg-808-icu-xx-2006-09-25.diff.gz:icu
 .  endif
 
+.  ifmake makesum
+DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
+.  endif
+
 PATCH_DIST_STRIP=-p1
 
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
@@ -172,12 +175,12 @@ CONFIGURE_ARGS+=--with-krb5
 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
 # so we always use the heimdal port. See
 # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+=	krb5.20:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=	krb5.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_TESTS)
+.  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
 .  endif
@@ -264,11 +267,9 @@ do-build:
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
-.  if exists(${MASTERDIR}/pkg-message${PKGNAMESUFFIX})
-post-build:
-	@ ${SED} "s|/usr/local|${PREFIX}|g" \
-		< ${MASTERDIR}/pkg-message${PKGNAMESUFFIX} \
-		> ${PKGMESSAGE}
+.  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
+SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
+PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
@@ -287,20 +288,13 @@ do-install:
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
-	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
-		< ${FILESDIR}/dot.$i.in \
-		> ${PREFIX}/share/postgresql/dot.$i.dist; \
-	${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/; \
+	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
+	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
-		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
+		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
-	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g" \
-		< ${FILESDIR}/pgsql.sh.tmpl \
-		> ${RCSCRIPT} ;\
-	${CHMOD} 555 ${RCSCRIPT} ;\
-	${CHOWN} root:pgsql ${RCSCRIPT} ;\
-	${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
+	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index 7543c441ea65..792006ae1de0 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,15 +1,15 @@
-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/postgresql-base-8.0.9.tar.bz2) = f9a044227ad6dc9c937d4853100733cb
+SHA256 (postgresql/postgresql-base-8.0.9.tar.bz2) = 8ed190ee5468f3685a1edbc5279490819ffa6fe64f1b6f0139bdbec365852417
+SIZE (postgresql/postgresql-base-8.0.9.tar.bz2) = 7824961
+MD5 (postgresql/postgresql-opt-8.0.9.tar.bz2) = 363e009214bfde8235d900da09c7c675
+SHA256 (postgresql/postgresql-opt-8.0.9.tar.bz2) = 007d5cded329dfbcc91b4f1d1ddb9473efb4316b1621294446ee611065393020
+SIZE (postgresql/postgresql-opt-8.0.9.tar.bz2) = 134706
+MD5 (postgresql/postgresql-docs-8.0.9.tar.bz2) = 0529eb29ac2c248a3b244b7bfc007456
+SHA256 (postgresql/postgresql-docs-8.0.9.tar.bz2) = b55d4a77c0c3b0f42c7233c08112b884e1463157160007efd70a63806ede632b
+SIZE (postgresql/postgresql-docs-8.0.9.tar.bz2) = 2262698
+MD5 (postgresql/postgresql-test-8.0.9.tar.bz2) = 8992a878fe5aa32e3da7fb84270614db
+SHA256 (postgresql/postgresql-test-8.0.9.tar.bz2) = f2b81b3cf7ade17a748fa84570c295817d82fd05b53d2e0fb9d9e922b0c613ea
+SIZE (postgresql/postgresql-test-8.0.9.tar.bz2) = 931363
 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/pkg-message-client b/databases/postgresql80-server/files/pkg-message-client.in
similarity index 100%
rename from databases/postgresql80-server/pkg-message-client
rename to databases/postgresql80-server/files/pkg-message-client.in
diff --git a/databases/postgresql74-server/pkg-message-contrib b/databases/postgresql80-server/files/pkg-message-contrib.in
similarity index 64%
rename from databases/postgresql74-server/pkg-message-contrib
rename to databases/postgresql80-server/files/pkg-message-contrib.in
index 8120f2d8d89c..2b29ffd33041 100644
--- a/databases/postgresql74-server/pkg-message-contrib
+++ b/databases/postgresql80-server/files/pkg-message-contrib.in
@@ -1,3 +1,3 @@
 The PostgreSQL contrib utilities have been installed. Please see
-/usr/local/share/doc/postgresql/contrib/README
+%%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
diff --git a/databases/postgresql80-server/pkg-message-plperl b/databases/postgresql80-server/files/pkg-message-plperl.in
similarity index 100%
rename from databases/postgresql80-server/pkg-message-plperl
rename to databases/postgresql80-server/files/pkg-message-plperl.in
diff --git a/databases/postgresql80-server/pkg-message-plpython b/databases/postgresql80-server/files/pkg-message-plpython.in
similarity index 100%
rename from databases/postgresql80-server/pkg-message-plpython
rename to databases/postgresql80-server/files/pkg-message-plpython.in
diff --git a/databases/postgresql80-server/pkg-message-pltcl b/databases/postgresql80-server/files/pkg-message-pltcl.in
similarity index 100%
rename from databases/postgresql80-server/pkg-message-pltcl
rename to databases/postgresql80-server/files/pkg-message-pltcl.in
diff --git a/databases/postgresql80-server/pkg-message-server b/databases/postgresql80-server/files/pkg-message-server.in
similarity index 71%
rename from databases/postgresql80-server/pkg-message-server
rename to databases/postgresql80-server/files/pkg-message-server.in
index ad1e6d1e82b9..88c35ccff457 100644
--- a/databases/postgresql80-server/pkg-message-server
+++ b/databases/postgresql80-server/files/pkg-message-server.in
@@ -6,7 +6,7 @@ kern.maxfiles using sysctl(8), or reconfigure your kernel
 appropriately.
 
 You should vacuum and backup your database regularly. There is a
-periodic script, ${LOCALBASE}/etc/periodic/daily/502.pgsql, that you
+periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that you
 may find useful. Per default, it perfoms vacuum on all databases
 nightly. See the script for instructions.
 
@@ -24,18 +24,30 @@ postgresql.conf also needed, of course):
   options         SEMMNU=120
 
 If you plan to access your PostgreSQL server using ODBC, please
-consider running the SQL script /usr/local/share/postgresql/odbc.sql
+consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
 to get the functions required for ODBC compliance.
 
+If you need to store any characters besides strict ASCII in your
+database, you will want to set a character set, and possibly a
+collation locale, before initializing the database. Add something
+similar to this to /etc/login.conf:
+---
+postgres:\
+	:setenv=LC_ALL=en_US.UTF-8,LC_COLLATE=C:\
+	:tc=default:
+---
+and run `cap_mkdb /etc/login.conf'.
+Then add 'postgresql_class="postgres"' to /etc/rc.conf.
+
 ======================================================================
 
 To initialize the database, run
 
-  /usr/local/etc/rc.d/010.pgsql.sh initdb
+  %%PREFIX%%/etc/rc.d/postgresql initdb
 
 You can then start PostgreSQL by running:
 
-  /usr/local/etc/rc.d/010.pgsql.sh start
+  %%PREFIX%%/etc/rc.d/postgresql start
 
 For postmaster settings, see ~pgsql/data/postgresql.conf
 
diff --git a/databases/postgresql80-server/files/pgsql.sh.tmpl b/databases/postgresql80-server/files/postgresql.in
similarity index 100%
rename from databases/postgresql80-server/files/pgsql.sh.tmpl
rename to databases/postgresql80-server/files/postgresql.in
diff --git a/databases/postgresql80-server/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server
index 654010402baa..b96587c84343 100644
--- a/databases/postgresql80-server/pkg-plist-server
+++ b/databases/postgresql80-server/pkg-plist-server
@@ -1,7 +1,6 @@
 bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
-etc/rc.d/010.pgsql.sh
 lib/libpgport.a
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 52d2c4703554..4d9a3589a421 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,22 +6,22 @@
 #
 
 PORTNAME?=	postgresql
-PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.1.4
-PORTREVISION?=	1
+PORTVERSION?=	8.1.5
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
+PKGNAMESUFFIX?=	-server
 DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
 		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
-CONFLICTS?=	${PORTNAME}-client-7.[0-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-7.[0-9]* \
-		${PORTNAME}-client-8.0.* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.0.*
+CONFLICTS?=	${PORTNAME}-client-7.* \
+		${PORTNAME}${PKGNAMESUFFIX}-7.* \
+		${PORTNAME}-client-8.[02-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-8.[02-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
@@ -48,12 +48,11 @@ PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
 		src/pl src/utils
 INSTALL_DIRS?=	${BUILD_DIRS}
-PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
-USE_RC_SUBR=	yes
-RCSCRIPT=	${PREFIX}/etc/rc.d/010.pgsql.sh
+USE_RC_SUBR=	postgresql
+SUB_FILES+=	dot.cshrc dot.profile
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
 .endif
@@ -75,7 +74,7 @@ CONFIGURE_ARGS+=--with-openssl
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
-BROKEN=		"Coredump during build on alpha 4.x"
+BROKEN=		Coredump during build on alpha 4.x
 .endif
 
 .if !defined(SLAVE_ONLY)
@@ -97,19 +96,19 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://gppl.moonbone.ru/ for more info
-#OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
+OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-.  if defined(SERVER_ONLY) && defined(WITH_HIER)
-#PATCH_SITES+=	http://gppl.moonbone.ru/:hier801054
-#PATCHFILES+=	hier-Pg8.0.1-0.5.4.diff.gz:hier801054
-#USE_BISON=	yes
+.  if (defined(SERVER_ONLY) && defined(WITH_HIER)) || make(makesum)
+PATCH_SITES+=	http://gppl.moonbone.ru/:hier812055
+PATCHFILES+=	hier-Pg8.1.2-0.5.5.diff.gz:hier812055
+USE_BISON=	yes
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_ICU)
+.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
@@ -119,6 +118,10 @@ PATCHFILES+=	pg-814-icu-xx-2006-09-25.diff.gz:icu
 
 PATCH_DIST_STRIP=-p1
 
+.  ifmake makesum
+DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
+.  endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
@@ -172,12 +175,12 @@ CONFIGURE_ARGS+=--with-krb5
 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
 # so we always use the heimdal port. See
 # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+=	krb5.20:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=	krb5.21:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_TESTS)
+.  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum)
 DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
 .  endif
@@ -259,11 +262,9 @@ do-build:
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
-.  if exists(${MASTERDIR}/pkg-message${PKGNAMESUFFIX})
-post-build:
-	@ ${SED} "s|/usr/local|${PREFIX}|g" \
-		< ${MASTERDIR}/pkg-message${PKGNAMESUFFIX} \
-		> ${PKGMESSAGE}
+.  if exists(${FILESDIR}/pkg-message${PKGNAMESUFFIX}.in)
+SUB_FILES+=	pkg-message${PKGNAMESUFFIX}
+PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .endif
 
@@ -282,20 +283,13 @@ do-install:
 .  if defined(SERVER_ONLY)
 	@ ${MKDIR} ${PREFIX}/share/postgresql
 .    for i in profile cshrc
-	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
-		< ${FILESDIR}/dot.$i.in \
-		> ${PREFIX}/share/postgresql/dot.$i.dist; \
-	${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/; \
+	${INSTALL_DATA} ${WRKDIR}/dot.$i ${PREFIX}/share/postgresql/dot.$i.dist; \
+	${INSTALL_DATA} -o pgsql -g pgsql ${WRKDIR}/dot.$i ~pgsql/dot.$i.dist ; \
 	if [ ! -f ~pgsql/.$i ]; then \
-		${CP} ${PREFIX}/share/postgresql/dot.$i.dist ~pgsql/.$i; \
+		${CP} -p ~pgsql/dot.$i.dist ~pgsql/.$i; \
 	fi
 .    endfor
-	@ ${SED} -e "s|%%PREFIX%%|${PREFIX}|g; s|%%RC_SUBR%%|${RC_SUBR}|g" \
-		< ${FILESDIR}/pgsql.sh.tmpl \
-		> ${RCSCRIPT} ;\
-	${CHMOD} 555 ${RCSCRIPT} ;\
-	${CHOWN} root:pgsql ${RCSCRIPT} ;\
-	${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
+	@ ${CHOWN} -R pgsql:pgsql ~pgsql/. ;\
 	${MKDIR} ${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index 47f2c0c9e4d3..c71931c05124 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,15 +1,18 @@
-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/postgresql-base-8.1.5.tar.bz2) = 30a42fd5fc5326edc217e28651e5053b
+SHA256 (postgresql/postgresql-base-8.1.5.tar.bz2) = cb878499848aa8abb82f1ae79574923174851b0396a5befa31f49089a3abb4df
+SIZE (postgresql/postgresql-base-8.1.5.tar.bz2) = 8044522
+MD5 (postgresql/postgresql-opt-8.1.5.tar.bz2) = bcd3eec7cfc759dbfdde4f9e8fa07d27
+SHA256 (postgresql/postgresql-opt-8.1.5.tar.bz2) = 4fe0dc14e02d65516348ec0e90633be2a3ada002c151fca8f2e7eba6556c8b1c
+SIZE (postgresql/postgresql-opt-8.1.5.tar.bz2) = 144784
+MD5 (postgresql/postgresql-docs-8.1.5.tar.bz2) = d104e7e645ea36407831ca59470c7a12
+SHA256 (postgresql/postgresql-docs-8.1.5.tar.bz2) = 01c0a848b0016598adfcebea74960340edf80fc037051d106b62bea14e1cd0c9
+SIZE (postgresql/postgresql-docs-8.1.5.tar.bz2) = 2489400
+MD5 (postgresql/postgresql-test-8.1.5.tar.bz2) = b3e050a0af7998d78f928b96d95fa6d7
+SHA256 (postgresql/postgresql-test-8.1.5.tar.bz2) = 60ed8d466a66dfe72994f7c8e45324e81e8ce6b91343eee07df5939f10559166
+SIZE (postgresql/postgresql-test-8.1.5.tar.bz2) = 947271
+MD5 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 15916bf13b99702599ce70b6475f7d86
+SHA256 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 14ecc3809ce69f47c3460efee3fc7fce78f68802936650fc4e1132adffd41d1e
+SIZE (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 31203
 MD5 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 2eb31538f3ee367767aeacd95b11d623
 SHA256 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 8dea05bdbc2b78426b159f628b693f69da17b930fe4882e166d5e8a3e698b7d9
 SIZE (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 3987
diff --git a/databases/postgresql81-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql81-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
index da57f46e3552..7c2831c41be0 100644
--- a/databases/postgresql81-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql81-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
@@ -1,5 +1,5 @@
---- src/backend/utils/misc/postgresql.conf.sample~	Tue Nov  8 00:45:49 2005
-+++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov  8 00:47:16 2005
+--- src/backend/utils/misc/postgresql.conf.sample.orig	Sun May 21 22:11:02 2006
++++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov  7 17:23:50 2006
 @@ -206,6 +206,7 @@
  
  # - Where to Log -
@@ -16,3 +16,12 @@
  #silent_mode = off			# DO NOT USE without syslog or 
  					# redirect_stderr
  
+@@ -339,6 +341,8 @@
+ #---------------------------------------------------------------------------
+ # AUTOVACUUM PARAMETERS
+ #---------------------------------------------------------------------------
++
++autovacuum = on
+ 
+ #autovacuum = off			# enable autovacuum subprocess?
+ #autovacuum_naptime = 60		# time between autovacuum runs, in secs
diff --git a/databases/postgresql81-server/pkg-message-client b/databases/postgresql81-server/files/pkg-message-client.in
similarity index 100%
rename from databases/postgresql81-server/pkg-message-client
rename to databases/postgresql81-server/files/pkg-message-client.in
diff --git a/databases/postgresql81-server/pkg-message-contrib b/databases/postgresql81-server/files/pkg-message-contrib.in
similarity index 64%
rename from databases/postgresql81-server/pkg-message-contrib
rename to databases/postgresql81-server/files/pkg-message-contrib.in
index 8120f2d8d89c..2b29ffd33041 100644
--- a/databases/postgresql81-server/pkg-message-contrib
+++ b/databases/postgresql81-server/files/pkg-message-contrib.in
@@ -1,3 +1,3 @@
 The PostgreSQL contrib utilities have been installed. Please see
-/usr/local/share/doc/postgresql/contrib/README
+%%PREFIX%%/share/doc/postgresql/contrib/README
 for more information.
diff --git a/databases/postgresql81-server/pkg-message-plperl b/databases/postgresql81-server/files/pkg-message-plperl.in
similarity index 100%
rename from databases/postgresql81-server/pkg-message-plperl
rename to databases/postgresql81-server/files/pkg-message-plperl.in
diff --git a/databases/postgresql81-server/pkg-message-plpython b/databases/postgresql81-server/files/pkg-message-plpython.in
similarity index 100%
rename from databases/postgresql81-server/pkg-message-plpython
rename to databases/postgresql81-server/files/pkg-message-plpython.in
diff --git a/databases/postgresql81-server/pkg-message-pltcl b/databases/postgresql81-server/files/pkg-message-pltcl.in
similarity index 100%
rename from databases/postgresql81-server/pkg-message-pltcl
rename to databases/postgresql81-server/files/pkg-message-pltcl.in
diff --git a/databases/postgresql81-server/pkg-message-server b/databases/postgresql81-server/files/pkg-message-server.in
similarity index 55%
rename from databases/postgresql81-server/pkg-message-server
rename to databases/postgresql81-server/files/pkg-message-server.in
index ad1e6d1e82b9..d22a731f40d8 100644
--- a/databases/postgresql81-server/pkg-message-server
+++ b/databases/postgresql81-server/files/pkg-message-server.in
@@ -5,10 +5,13 @@ If you have many tables and many clients running, consider raising
 kern.maxfiles using sysctl(8), or reconfigure your kernel
 appropriately.
 
-You should vacuum and backup your database regularly. There is a
-periodic script, ${LOCALBASE}/etc/periodic/daily/502.pgsql, that you
-may find useful. Per default, it perfoms vacuum on all databases
-nightly. See the script for instructions.
+The port is set up to use autovacuum for new databases, but you might
+also want to vacuum and perhaps backup your database regularly. There
+is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
+you may find useful. You can use it to backup and perfom vacuum on all
+databases nightly. Per default, it perfoms `vacuum analyze'. See the
+script for instructions. For autovacuum settings, please review
+~pgsql/data/postgresql.conf.
 
 To allow many simultaneous connections to your PostgreSQL server, you
 should raise the SystemV shared memory limits in your kernel. Here are
@@ -24,22 +27,34 @@ postgresql.conf also needed, of course):
   options         SEMMNU=120
 
 If you plan to access your PostgreSQL server using ODBC, please
-consider running the SQL script /usr/local/share/postgresql/odbc.sql
+consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
 to get the functions required for ODBC compliance.
 
+If you need to store any characters besides strict ASCII in your
+database, you will want to set a character set, and possibly a
+collation locale, before initializing the database. Add something
+similar to this to /etc/login.conf:
+---
+postgres:\
+	:setenv=LC_ALL=en_US.UTF-8,LC_COLLATE=C:\
+	:tc=default:
+---
+and run `cap_mkdb /etc/login.conf'.
+Then add 'postgresql_class="postgres"' to /etc/rc.conf.
+
 ======================================================================
 
 To initialize the database, run
 
-  /usr/local/etc/rc.d/010.pgsql.sh initdb
+  %%PREFIX%%/etc/rc.d/postgresql initdb
 
 You can then start PostgreSQL by running:
 
-  /usr/local/etc/rc.d/010.pgsql.sh start
+  %%PREFIX%%/etc/rc.d/postgresql start
 
 For postmaster settings, see ~pgsql/data/postgresql.conf
 
-NB. FreeBSD's PostgreSQL port now by default logs to syslog
+NB. FreeBSD's PostgreSQL port logs to syslog by default
     See ~pgsql/data/postgresql.conf for more info
 
 ======================================================================
diff --git a/databases/postgresql81-server/files/pgsql.sh.tmpl b/databases/postgresql81-server/files/postgresql.in
similarity index 100%
rename from databases/postgresql81-server/files/pgsql.sh.tmpl
rename to databases/postgresql81-server/files/postgresql.in
diff --git a/databases/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server
index 9e2451b51f86..db7177d31302 100644
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@@ -1,7 +1,6 @@
 bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
-etc/rc.d/010.pgsql.sh
 lib/libpgport.a
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so