Update PostgreSQL to latest versions: 8.1.5, 8.0.9, 7.4.14 and 7.3.16.

Release notes:
8.1.5  http://www.postgresql.org/docs/8.1/static/release.html#RELEASE-8-1-5
8.0.9  http://www.postgresql.org/docs/8.0/static/release.html#RELEASE-8-0-9
7.4.14 http://www.postgresql.org/docs/7.4/static/release.html#RELEASE-7-4-14
7.3.16 http://www.postgresql.org/docs/7.3/static/release.html#RELEASE-7-3-16

Change name of the rc script from '010.pgsql.sh' to 'postgresql'

Add optional hierachy patch added for 7.4 and 8.1 ports.

Chase heimdal libs update [reported by several]

For 8.1+ the port enables autovacuum in ~pgsql/postgresql.conf when
running initdb

Cleanup the ports, moving pkg-message-* to files/pkg-message-*.in and
files/pgsql.sh.tmpl to files/postgresql.in. [ports/97767]

PR: ports/97767, submitted by delphij@FreeBSD.org

10 files changed, 46 insertions, 41 deletions

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
index 722d50cb4244..722d50cb4244 100644
--- a/databases/postgresql73-server/pkg-message-client
+++ b/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
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
index 5d0c83920563..5d0c83920563 100644
--- a/databases/postgresql73-server/pkg-message-plperl
+++ b/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
index c413582b6295..c413582b6295 100644
--- a/databases/postgresql73-server/pkg-message-plpython
+++ b/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
index 0902b858de0b..0902b858de0b 100644
--- a/databases/postgresql73-server/pkg-message-pltcl
+++ b/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
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
index d3014f580dc0..d3014f580dc0 100644
--- a/databases/postgresql73-server/files/pgsql.sh.tmpl
+++ b/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